Chisel-Team · ferriarnus · Jan 23, 2024 · Jan 23, 2024 · Jan 23, 2024 · Jan 24, 2024
diff --git a/base/build.gradle b/base/build.gradle
@@ -56,7 +56,7 @@ minecraft {
             }
 
             args '--mod', 'chisel', '--all', '--output', '"' + project.file('src/generated/resources/') + '"',
-                 '--existing', '"' + project.file('src/main/resources') + '"' 
+                 '--existing', '"' + project.file('src/main/resources') + '"'
 
         }
     }

diff --git a/base/lib/CTM_DEV-1.18.2-1.1.6+487b597.jar b/base/lib/CTM_DEV-1.18.2-1.1.6+487b597.jar
diff --git a/base/src/generated/resources/.cache/cache b/base/src/generated/resources/.cache/cache
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/array.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/array.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/array"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/braid.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/braid.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/braid"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/chaotic_bricks.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/chaotic_bricks.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/chaotic_bricks"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/chaotic_medium.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/chaotic_medium.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/chaotic_medium"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/chaotic_small.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/chaotic_small.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/chaotic_small"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/circular.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/circular.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/circular"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/circularct.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/circularct.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/circularct"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/cracked.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/cracked.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/cracked"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/cracked_bricks.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/cracked_bricks.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/cracked_bricks"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/cuts.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/cuts.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/cuts"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/dent.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/dent.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/dent"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/encased_bricks.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/encased_bricks.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/encased_bricks"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/french_1.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/french_1.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/french_1"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/french_2.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/french_2.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/french_2"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/jellybean.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/jellybean.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/jellybean"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/layers.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/layers.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/layers"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/mosaic.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/mosaic.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/mosaic"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/ornate.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/ornate.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/ornate"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/panel.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/panel.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/panel"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/pillar.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/pillar.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/pillar"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/prism.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/prism.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/prism"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/road.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/road.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/road"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/slanted.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/slanted.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/slanted"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/small_bricks.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/small_bricks.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/small_bricks"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/soft_bricks.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/soft_bricks.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/soft_bricks"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/solid_bricks.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/solid_bricks.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/solid_bricks"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/tiles_large.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/tiles_large.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/tiles_large"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/tiles_medium.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/tiles_medium.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/tiles_medium"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/tiles_small.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/tiles_small.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/tiles_small"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/triple_bricks.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/triple_bricks.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/triple_bricks"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/twisted.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/twisted.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/twisted"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/weaver.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/weaver.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/weaver"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/basalt/zag.json b/base/src/generated/resources/assets/chisel/blockstates/basalt/zag.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/basalt/zag"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/bookshelf/acacia/abandoned.json b/base/src/generated/resources/assets/chisel/blockstates/bookshelf/acacia/abandoned.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/bookshelf/acacia/abandoned"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/bookshelf/acacia/brim.json b/base/src/generated/resources/assets/chisel/blockstates/bookshelf/acacia/brim.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/bookshelf/acacia/brim"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/bookshelf/acacia/cans.json b/base/src/generated/resources/assets/chisel/blockstates/bookshelf/acacia/cans.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/bookshelf/acacia/cans"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/bookshelf/acacia/historian.json b/base/src/generated/resources/assets/chisel/blockstates/bookshelf/acacia/historian.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/bookshelf/acacia/historian"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/bookshelf/acacia/hoarder.json b/base/src/generated/resources/assets/chisel/blockstates/bookshelf/acacia/hoarder.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/bookshelf/acacia/hoarder"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/bookshelf/acacia/necromancer.json b/base/src/generated/resources/assets/chisel/blockstates/bookshelf/acacia/necromancer.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/bookshelf/acacia/necromancer"
+    }
+  }
+}
diff --git a/...rc/generated/resources/assets/chisel/blockstates/bookshelf/acacia/novice_necromancer.json b/...rc/generated/resources/assets/chisel/blockstates/bookshelf/acacia/novice_necromancer.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/bookshelf/acacia/novice_necromancer"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/bookshelf/acacia/papers.json b/base/src/generated/resources/assets/chisel/blockstates/bookshelf/acacia/papers.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/bookshelf/acacia/papers"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/bookshelf/acacia/rainbow.json b/base/src/generated/resources/assets/chisel/blockstates/bookshelf/acacia/rainbow.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/bookshelf/acacia/rainbow"
+    }
+  }
+}
diff --git a/base/src/generated/resources/assets/chisel/blockstates/bookshelf/acacia/redtomes.json b/base/src/generated/resources/assets/chisel/blockstates/bookshelf/acacia/redtomes.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chisel:block/bookshelf/acacia/redtomes"
+    }
+  }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,7 +56,7 @@ minecraft { @@
                 }
                 args '--mod', 'chisel', '--all', '--output', '"' + project.file('src/generated/resources/') + '"',
-                     '--existing', '"' + project.file('src/main/resources') + '"'
+                     '--existing', '"' + project.file('src/main/resources') + '"'
             }
         }
@@ Expand Down @@