Merge remote-tracking branch 'origin/1.20.1' into 1.20.1

CHANGELOG.md

@@ -1,6 +1,7 @@
 ### ADDITIONS:
+- Added Decoration Blocks
 
 ### FIXES:
-- fixed space crashing when using upgraded non-spacesuit armor
 
-### CHANGES:
+### CHANGES:
+- updated to GT 1.2.3

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx4G -Xss4M
 
 mod_id=gcyr
 mod_name=Gregicality Rocketry
-mod_version=0.1.7-a
+mod_version=0.1.8
 maven_group=argent_matter
 
-loom.platform=forge
+loom.platform=forge

settings.gradle

@@ -36,8 +36,8 @@ dependencyResolutionManagement {
         def vineFlowerVersion = "1.+"
         def macheteVersion = "1.+"
         def configurationVersion = "2.2.0"
-        def gtCeuVersion = "1.2.1"
-        def ldLibVersion = "1.0.25.f"
+        def gtCeuVersion = "1.2.3"
+        def ldLibVersion = "1.0.25.j"
         def mixinExtrasVersion = "0.2.0"
         def mixinVersion = "0.8.6-SNAPSHOT"
 

src/generated/resources/assets/gcyr/blockstates/cobbled_mercury_rock_stairs.json

@@ -0,0 +1,209 @@
+{
+  "variants": {
+    "facing=east,half=bottom,shape=inner_left": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_inner",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,half=bottom,shape=inner_right": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_inner"
+    },
+    "facing=east,half=bottom,shape=outer_left": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_outer",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,half=bottom,shape=outer_right": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_outer"
+    },
+    "facing=east,half=bottom,shape=straight": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs"
+    },
+    "facing=east,half=top,shape=inner_left": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_inner",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=east,half=top,shape=inner_right": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=east,half=top,shape=outer_left": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_outer",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=east,half=top,shape=outer_right": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=east,half=top,shape=straight": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=north,half=bottom,shape=inner_left": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_inner",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,half=bottom,shape=inner_right": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_inner",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=north,half=bottom,shape=outer_left": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_outer",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,half=bottom,shape=outer_right": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_outer",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=north,half=bottom,shape=straight": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=north,half=top,shape=inner_left": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=north,half=top,shape=inner_right": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_inner",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=north,half=top,shape=outer_left": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=north,half=top,shape=outer_right": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_outer",
+      "uvlock": true,
+      "x": 180
+    },
+    "facing=north,half=top,shape=straight": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=south,half=bottom,shape=inner_left": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_inner"
+    },
+    "facing=south,half=bottom,shape=inner_right": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_inner",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=south,half=bottom,shape=outer_left": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_outer"
+    },
+    "facing=south,half=bottom,shape=outer_right": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_outer",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=south,half=bottom,shape=straight": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=south,half=top,shape=inner_left": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=south,half=top,shape=inner_right": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    },
+    "facing=south,half=top,shape=outer_left": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=south,half=top,shape=outer_right": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    },
+    "facing=south,half=top,shape=straight": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs",
+      "uvlock": true,
+      "x": 180,
+      "y": 90
+    },
+    "facing=west,half=bottom,shape=inner_left": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_inner",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,half=bottom,shape=inner_right": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_inner",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=west,half=bottom,shape=outer_left": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_outer",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,half=bottom,shape=outer_right": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_outer",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=west,half=bottom,shape=straight": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=west,half=top,shape=inner_left": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    },
+    "facing=west,half=top,shape=inner_right": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_inner",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=west,half=top,shape=outer_left": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    },
+    "facing=west,half=top,shape=outer_right": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs_outer",
+      "uvlock": true,
+      "x": 180,
+      "y": 270
+    },
+    "facing=west,half=top,shape=straight": {
+      "model": "gcyr:block/cobbled_mercury_rock_stairs",
+      "uvlock": true,
+      "x": 180,
+      "y": 180
+    }
+  }
+}

src/generated/resources/assets/gcyr/blockstates/martian_cobblestone.json

@@ -0,0 +1,20 @@
+{
+  "variants": {
+    "": [
+      {
+        "model": "gcyr:block/martian_cobblestone"
+      },
+      {
+        "model": "gcyr:block/martian_cobblestone",
+        "y": 180
+      },
+      {
+        "model": "gcyr:block/martian_cobblestone_mirrored"
+      },
+      {
+        "model": "gcyr:block/martian_cobblestone_mirrored",
+        "y": 180
+      }
+    ]
+  }
+}

src/generated/resources/assets/gcyr/blockstates/martian_cobblestone_slab.json

@@ -0,0 +1,13 @@
+{
+  "variants": {
+    "type=bottom": {
+      "model": "gcyr:block/martian_cobblestone_slab"
+    },
+    "type=double": {
+      "model": "gcyr:block/martian_cobblestone"
+    },
+    "type=top": {
+      "model": "gcyr:block/martian_cobblestone_slab_top"
+    }
+  }
+}