Merge branch 'refs/heads/1.20.2/dev' into 1.20.5/dev

# Conflicts:
#	gradle.properties

gradle.properties

@@ -9,7 +9,7 @@ yarn_mappings = 1.20.5+build.1
 loader_version = 0.15.10
 
 # Mod Properties
-mod_version = 3.0.0-beta.6
+mod_version = 3.0.0
 mod_minecraft_version = 1.20.5
 maven_group = me.pepperbell
 archives_base_name = continuity

src/main/resources/assets/continuity/lang/fil_ph.json

@@ -1,9 +1,13 @@
 {
   "options.continuity.title": "Pagsasaayos ng Continuity",
-  "options.continuity.connected_textures": "Konektado na mga Textures",
-  "options.continuity.connected_textures.tooltip": "Paganahin o hindi paganahin ang mga konektadong textures sa mga bloke.",
-  "options.continuity.emissive_textures": "Emisibo na mga Textures",
-  "options.continuity.emissive_textures.tooltip": "Paganahin o hindi paganahin ang mga emisibong textures sa mga bloke at modelong aytem.",
+  "options.continuity.connected_textures": "Konektado na mga Testura",
+  "options.continuity.connected_textures.tooltip": "Paganahin o hindi paganahin ang mga konektadong testura sa mga bloke.",
+  "options.continuity.emissive_textures": "Emisibo na mga Testura",
+  "options.continuity.emissive_textures.tooltip": "Paganahin o hindi paganahin ang mga emisibong testura sa mga bloke at modelong aytem.",
   "options.continuity.custom_block_layers": "Mga Pasadyang Suson",
-  "options.continuity.custom_block_layers.tooltip": "Paganahin o hindi paganahin ang mga pasadyang suson."
+  "options.continuity.custom_block_layers.tooltip": "Paganahin o hindi paganahin ang mga pasadyang suson.",
+  "resourcePack.continuity.default.name": "Default na Konektadong mga Testura",
+  "resourcePack.continuity.default.description": "Salamin, batong buhangin, mga bookshelf",
+  "resourcePack.continuity.glass_pane_culling_fix.name": "Pag-aayos sa gitnang panig ng salamin",
+  "resourcePack.continuity.glass_pane_culling_fix.description": "Tanggalin ang linya sa gitnang panig ng salamin."
 }

src/main/resources/assets/continuity/lang/pl_pl.json

@@ -5,5 +5,9 @@
   "options.continuity.emissive_textures": "Tekstury emisyjne",
   "options.continuity.emissive_textures.tooltip": "Włącz lub wyłącz tekstury emisyjne dla bloków i modeli przedmiotów.",
   "options.continuity.custom_block_layers": "Niestandardowe warstwy bloków",
-  "options.continuity.custom_block_layers.tooltip": "Włącz lub wyłącz niestandardowe warstwy bloków."
+  "options.continuity.custom_block_layers.tooltip": "Włącz lub wyłącz niestandardowe warstwy bloków.",
+  "resourcePack.continuity.default.name": "Domyślne połączone tekstury",
+  "resourcePack.continuity.default.description": "Szkło, piaskowiec, biblioteczki",
+  "resourcePack.continuity.glass_pane_culling_fix.name": "Poprawka chowania szyb",
+  "resourcePack.continuity.glass_pane_culling_fix.description": "Chowanie ścian pomiędzy szybami"
 }

src/main/resources/assets/continuity/lang/zh_tw.json

@@ -5,5 +5,9 @@
   "options.continuity.emissive_textures": "高光紋理",
   "options.continuity.emissive_textures.tooltip": "啟用或停用方塊和物品模型的高光紋理。",
   "options.continuity.custom_block_layers": "自訂方塊層",
-  "options.continuity.custom_block_layers.tooltip": "啟用或停用自訂方塊層。"
+  "options.continuity.custom_block_layers.tooltip": "啟用或停用自訂方塊層。",
+  "resourcePack.continuity.default.name": "預設連接紋理",
+  "resourcePack.continuity.default.description": "玻璃、砂岩、書櫃",
+  "resourcePack.continuity.glass_pane_culling_fix.name": "玻璃片剔除修正",
+  "resourcePack.continuity.glass_pane_culling_fix.description": "剔除玻璃片之間的面"
 }

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/bookshelf/bookshelf.properties

@@ -1,5 +1,7 @@
 method=horizontal
+matchTiles=bookshelf
 matchBlocks=bookshelf
 tiles=0-3
 faces=sides
+connect=block
 resourceCondition=textures/block/bookshelf.png

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/black/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=black_stained_glass
 matchBlocks=black_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/black/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=black_stained_glass
 matchBlocks=black_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/blue/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=blue_stained_glass
 matchBlocks=blue_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/blue/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=blue_stained_glass
 matchBlocks=blue_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/brown/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=brown_stained_glass
 matchBlocks=brown_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/brown/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=brown_stained_glass
 matchBlocks=brown_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/cyan/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=cyan_stained_glass
 matchBlocks=cyan_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/cyan/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=cyan_stained_glass
 matchBlocks=cyan_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/gray/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=gray_stained_glass
 matchBlocks=gray_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/gray/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=gray_stained_glass
 matchBlocks=gray_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/green/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=green_stained_glass
 matchBlocks=green_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/green/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=green_stained_glass
 matchBlocks=green_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/light_blue/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=light_blue_stained_glass
 matchBlocks=light_blue_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/light_blue/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=light_blue_stained_glass
 matchBlocks=light_blue_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/light_gray/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=light_gray_stained_glass
 matchBlocks=light_gray_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/light_gray/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=light_gray_stained_glass
 matchBlocks=light_gray_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/lime/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=lime_stained_glass
 matchBlocks=lime_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/lime/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=lime_stained_glass
 matchBlocks=lime_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/magenta/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=magenta_stained_glass
 matchBlocks=magenta_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/magenta/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=magenta_stained_glass
 matchBlocks=magenta_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/orange/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=orange_stained_glass
 matchBlocks=orange_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/orange/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=orange_stained_glass
 matchBlocks=orange_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/pink/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=pink_stained_glass
 matchBlocks=pink_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/pink/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=pink_stained_glass
 matchBlocks=pink_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/purple/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=purple_stained_glass
 matchBlocks=purple_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/purple/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=purple_stained_glass
 matchBlocks=purple_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/red/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=red_stained_glass
 matchBlocks=red_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/red/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=red_stained_glass
 matchBlocks=red_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/standard/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=glass
 matchBlocks=glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/standard/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=glass
 matchBlocks=glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/tinted/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=tinted_glass
 matchBlocks=tinted_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/white/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=white_stained_glass
 matchBlocks=white_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/white/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=white_stained_glass
 matchBlocks=white_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/yellow/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=yellow_stained_glass
 matchBlocks=yellow_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/yellow/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=yellow_stained_glass
 matchBlocks=yellow_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/sandstone/chiseled_red_sandstone/chiseled_red_sandstone.properties

@@ -1,5 +1,7 @@
 method=horizontal
 matchTiles=chiseled_red_sandstone
+matchBlocks=chiseled_red_sandstone
 tiles=0-3
-connect=tile
+faces=sides
+connect=block
 resourceCondition=textures/block/chiseled_red_sandstone.png

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/sandstone/chiseled_sandstone/chiseled_sandstone.properties

@@ -1,5 +1,7 @@
 method=horizontal
 matchTiles=chiseled_sandstone
+matchBlocks=chiseled_sandstone
 tiles=0-3
-connect=tile
+faces=sides
+connect=block
 resourceCondition=textures/block/chiseled_sandstone.png

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/sandstone/cut_red_sandstone/cut_red_sandstone.properties

@@ -1,5 +1,7 @@
 method=horizontal
 matchTiles=cut_red_sandstone
+matchBlocks=cut_red_sandstone
 tiles=0-3
-connect=tile
+faces=sides
+connect=block
 resourceCondition=textures/block/cut_red_sandstone.png

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/sandstone/cut_sandstone/cut_sandstone.properties

@@ -1,5 +1,7 @@
 method=horizontal
 matchTiles=cut_sandstone
+matchBlock=cut_sandstone
 tiles=0-3
-connect=tile
+faces=sides
+connect=block
 resourceCondition=textures/block/cut_sandstone.png

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/bookshelf/bookshelf.properties

@@ -1,5 +1,7 @@
 method=horizontal
+matchTiles=bookshelf
 matchBlocks=bookshelf
 tiles=0-3
 faces=sides
+connect=block
 resourceCondition=textures/block/bookshelf.png@programmer_art

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/black/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=black_stained_glass
 matchBlocks=black_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/black/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=black_stained_glass
 matchBlocks=black_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/blue/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=blue_stained_glass
 matchBlocks=blue_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/blue/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=blue_stained_glass
 matchBlocks=blue_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/brown/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=brown_stained_glass
 matchBlocks=brown_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/brown/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=brown_stained_glass
 matchBlocks=brown_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/cyan/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=cyan_stained_glass
 matchBlocks=cyan_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/cyan/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=cyan_stained_glass
 matchBlocks=cyan_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/gray/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=gray_stained_glass
 matchBlocks=gray_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/gray/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=gray_stained_glass
 matchBlocks=gray_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/green/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=green_stained_glass
 matchBlocks=green_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/green/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=green_stained_glass
 matchBlocks=green_stained_glass_pane
 tiles=0-46
 faces=sides

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/light_blue/glass.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=light_blue_stained_glass
 matchBlocks=light_blue_stained_glass
 tiles=0-46
 connect=block

src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/light_blue/glass_pane.properties

@@ -1,4 +1,5 @@
 method=ctm
+matchTiles=light_blue_stained_glass
 matchBlocks=light_blue_stained_glass_pane
 tiles=0-46
 faces=sides