More merge fixes

and use "Levelled" for Cauldrons in 1.13
This commit is contained in:
Sn0wStorm
2018-10-27 12:09:53 +02:00
parent dd495d5204
commit 54a05b83fe
7 changed files with 242 additions and 218 deletions
+2 -1
View File
@@ -12,6 +12,7 @@
# IntelliJ
/.idea
/*.iml
# various other potential build files
/build
@@ -23,4 +24,4 @@
.DS_Store
# maven
/target
/target