fixed merge conflict from master

This commit is contained in:
Mohammad-Ali Minaie
2018-10-27 16:26:09 -04:00
4 changed files with 16 additions and 10 deletions

View File

@@ -1,11 +1,11 @@
# To-Dos
## 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