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

Fusion-Flux · Jul 11, 2023 · 63ece3a · 63ece3a
2 parents a5b4f00 + fc4b949
commit 63ece3a
Show file tree

Hide file tree

Showing 36 changed files with 8 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -83,8 +83,9 @@ dependencies {
 	minecraft("com.mojang:minecraft:$minecraftVersion")
 
 	mappings(loom.layered {
-		officialMojangMappings()
+		mappings("org.quiltmc:quilt-mappings:${minecraft_version}+build.${mappings_version}:intermediary-v2")
 		parchment("org.parchmentmc.data:parchment-${project["parchment_version"]}@zip")
+		officialMojangMappings()
 	})
 
 	modImplementation("org.quiltmc:quilt-loader:${project["loader_version"]}")

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,8 @@ org.gradle.jvmargs=-Xmx2G
 
 # Quilt Properties
 minecraft_version=1.20.1
-parchment_version=1.19.3:2023.03.12
+parchment_version=1.20.1:2023.07.09
+mappings_version=1
 loader_version=0.19.1
 
 # Mod Properties

diff --git a/src/main/resources/assets/portalcubed/textures/block/power_block_00.png b/src/main/resources/assets/portalcubed/textures/block/power_block_00.png
diff --git a/src/main/resources/assets/portalcubed/textures/block/power_block_01.png b/src/main/resources/assets/portalcubed/textures/block/power_block_01.png
diff --git a/src/main/resources/assets/portalcubed/textures/block/power_block_02.png b/src/main/resources/assets/portalcubed/textures/block/power_block_02.png
diff --git a/src/main/resources/assets/portalcubed/textures/block/power_block_03.png b/src/main/resources/assets/portalcubed/textures/block/power_block_03.png
diff --git a/src/main/resources/assets/portalcubed/textures/block/power_block_04.png b/src/main/resources/assets/portalcubed/textures/block/power_block_04.png
diff --git a/src/main/resources/assets/portalcubed/textures/block/power_block_05.png b/src/main/resources/assets/portalcubed/textures/block/power_block_05.png
diff --git a/src/main/resources/assets/portalcubed/textures/block/power_block_06.png b/src/main/resources/assets/portalcubed/textures/block/power_block_06.png
diff --git a/src/main/resources/assets/portalcubed/textures/block/power_block_07.png b/src/main/resources/assets/portalcubed/textures/block/power_block_07.png
diff --git a/src/main/resources/assets/portalcubed/textures/block/power_block_08.png b/src/main/resources/assets/portalcubed/textures/block/power_block_08.png
diff --git a/src/main/resources/assets/portalcubed/textures/block/power_block_09.png b/src/main/resources/assets/portalcubed/textures/block/power_block_09.png
diff --git a/src/main/resources/assets/portalcubed/textures/block/power_block_10.png b/src/main/resources/assets/portalcubed/textures/block/power_block_10.png
diff --git a/src/main/resources/assets/portalcubed/textures/block/power_block_11.png b/src/main/resources/assets/portalcubed/textures/block/power_block_11.png
diff --git a/src/main/resources/assets/portalcubed/textures/block/power_block_12.png b/src/main/resources/assets/portalcubed/textures/block/power_block_12.png
diff --git a/src/main/resources/assets/portalcubed/textures/block/power_block_13.png b/src/main/resources/assets/portalcubed/textures/block/power_block_13.png
diff --git a/src/main/resources/assets/portalcubed/textures/block/power_block_14.png b/src/main/resources/assets/portalcubed/textures/block/power_block_14.png
diff --git a/src/main/resources/assets/portalcubed/textures/block/power_block_15.png b/src/main/resources/assets/portalcubed/textures/block/power_block_15.png
diff --git a/src/main/resources/assets/portalcubed/textures/item/power_block_00.png b/src/main/resources/assets/portalcubed/textures/item/power_block_00.png
diff --git a/src/main/resources/assets/portalcubed/textures/item/power_block_01.png b/src/main/resources/assets/portalcubed/textures/item/power_block_01.png
diff --git a/src/main/resources/assets/portalcubed/textures/item/power_block_02.png b/src/main/resources/assets/portalcubed/textures/item/power_block_02.png
diff --git a/src/main/resources/assets/portalcubed/textures/item/power_block_03.png b/src/main/resources/assets/portalcubed/textures/item/power_block_03.png
diff --git a/src/main/resources/assets/portalcubed/textures/item/power_block_04.png b/src/main/resources/assets/portalcubed/textures/item/power_block_04.png
diff --git a/src/main/resources/assets/portalcubed/textures/item/power_block_05.png b/src/main/resources/assets/portalcubed/textures/item/power_block_05.png
diff --git a/src/main/resources/assets/portalcubed/textures/item/power_block_06.png b/src/main/resources/assets/portalcubed/textures/item/power_block_06.png
diff --git a/src/main/resources/assets/portalcubed/textures/item/power_block_07.png b/src/main/resources/assets/portalcubed/textures/item/power_block_07.png
diff --git a/src/main/resources/assets/portalcubed/textures/item/power_block_08.png b/src/main/resources/assets/portalcubed/textures/item/power_block_08.png
diff --git a/src/main/resources/assets/portalcubed/textures/item/power_block_09.png b/src/main/resources/assets/portalcubed/textures/item/power_block_09.png
diff --git a/src/main/resources/assets/portalcubed/textures/item/power_block_10.png b/src/main/resources/assets/portalcubed/textures/item/power_block_10.png
diff --git a/src/main/resources/assets/portalcubed/textures/item/power_block_11.png b/src/main/resources/assets/portalcubed/textures/item/power_block_11.png
diff --git a/src/main/resources/assets/portalcubed/textures/item/power_block_12.png b/src/main/resources/assets/portalcubed/textures/item/power_block_12.png
diff --git a/src/main/resources/assets/portalcubed/textures/item/power_block_13.png b/src/main/resources/assets/portalcubed/textures/item/power_block_13.png
diff --git a/src/main/resources/assets/portalcubed/textures/item/power_block_14.png b/src/main/resources/assets/portalcubed/textures/item/power_block_14.png
diff --git a/src/main/resources/assets/portalcubed/textures/item/power_block_15.png b/src/main/resources/assets/portalcubed/textures/item/power_block_15.png
diff --git a/src/main/resources/data/portalcubed/tags/blocks/cant_place_portal_on.json b/src/main/resources/data/portalcubed/tags/blocks/cant_place_portal_on.json
@@ -133,6 +133,8 @@
     "#minecraft:leaves",
     "#minecraft:all_hanging_signs",
     "minecraft:moss_carpet",
+    "minecraft:pitcher_crop",
+    "minecraft:lily_pad",
     "minecraft:sniffer_egg",
     "minecraft:end_portal_frame",
     "minecraft:snow",

diff --git a/src/main/resources/data/portalcubed/tags/blocks/portal_solid.json b/src/main/resources/data/portalcubed/tags/blocks/portal_solid.json
@@ -9,6 +9,8 @@
     "portalcubed:matter_inquisition_field",
     "portalcubed:toxic_goo",
     "minecraft:lava",
+    "minecraft:nether_portal",
+    "minecraft:end_portal",
     "portalcubed:portal_1_smooth_gray_panel_facade",
     "portalcubed:portal_1_smooth_gray_half_panel_facade",
     "portalcubed:dirty_portal_1_smooth_gray_panel_facade",