update with merge conflict resolved

This commit is contained in:
Mohammad-Ali Minaie
2018-10-27 15:28:36 -04:00
5 changed files with 20 additions and 27 deletions

View File

@@ -2,6 +2,10 @@
## Bugs
- [ ] Placement bug for crucible from tongs
- [ ] Wootz shovel not rendering (NORTH)
- [ ] Damascus Rendering in tongs
- [ ] bug for recipe with damascus shovel
- [ ] redstone 1 is ok redstone 2 is not ok
## Current Feature
- [ ] weapon upgrades