From bd6b2f0e35437cbe9f9d185eda1440dceb431aa6 Mon Sep 17 00:00:00 2001
From: Matthias <12-build@web.de>
Date: Sat, 18 Nov 2023 21:55:41 +0100
Subject: [PATCH] reslove merge conflict

---
 src/main/kotlin/com/tcreative/addons/Main.kt           | 2 ++
 src/main/kotlin/com/tcreative/addons/vase/VaseBlock.kt | 7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/com/tcreative/addons/Main.kt b/src/main/kotlin/com/tcreative/addons/Main.kt
index 680ab41..637fb35 100644
--- 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
index e238b68..9801a07 100644
--- 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"))
     }