reslove merge conflict

LotsOfPixelsStudios · Nov 18, 2023 · bd6b2f0 · bd6b2f0
1 parent 493abb3
commit bd6b2f0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/main/kotlin/com/tcreative/addons/Main.kt b/src/main/kotlin/com/tcreative/addons/Main.kt
@@ -8,6 +8,7 @@ import com.tcreative.addons.soldier.soldierMelee
 import com.tcreative.addons.soldier.soldierRange
 import com.tcreative.addons.soldier.soldierSpawnRules
 import com.tcreative.addons.vase.vase
+import com.tcreative.addons.vase.vaseBlock
 
 fun main(args: Array<String>) {
     val config = config("Odyssey Demo") {
@@ -25,6 +26,7 @@ fun main(args: Array<String>) {
         soldierSpawnRules()
 
         vase(this)
+        vaseBlock()
     }
 
     if (args.contains("zip-world")) {

diff --git a/src/main/kotlin/com/tcreative/addons/vase/VaseBlock.kt b/src/main/kotlin/com/tcreative/addons/vase/VaseBlock.kt
@@ -1,11 +1,10 @@
 package com.tcreative.addons.vase
 
-import com.tcreative.devtools.tranclate.builder.getResource
-import com.tcreative.devtools.tranclate.systemaddon.Addon
+import com.lop.devtools.monstera.addon.Addon
+import com.lop.devtools.monstera.files.getResource
 
 fun Addon.vaseBlock() {
-    block {
-        name("vase_1", "Small Vase")
+    block("vase_1", "Small Vase") {
         geometry(getResource("vase/vase1.geo.json"))
         texture(getResource("vase/vase1_1.png"))
     }