From 1cd57df0195fba96e848159cf079b03d5077ba76 Mon Sep 17 00:00:00 2001 From: Rad <63958709+Radk6@users.noreply.github.com> Date: Wed, 27 Nov 2024 02:56:11 +0100 Subject: [PATCH 1/5] Update pl_pl.json (#545) * Update pl_pl.json * Update pl_pl.json --- src/main/resources/assets/continuity/lang/pl_pl.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/continuity/lang/pl_pl.json b/src/main/resources/assets/continuity/lang/pl_pl.json index c0693db4..de311e2a 100644 --- a/src/main/resources/assets/continuity/lang/pl_pl.json +++ b/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" } From 377b0ed8d0d408ac7c1a0fd510c3823a8e3fb7d5 Mon Sep 17 00:00:00 2001 From: dirtTW <31981880+yichifauzi@users.noreply.github.com> Date: Wed, 27 Nov 2024 08:57:17 +0700 Subject: [PATCH 2/5] Update Traditional Chinese (zh_tw.json) (#546) Update Traditional Chinese localization --- src/main/resources/assets/continuity/lang/zh_tw.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/continuity/lang/zh_tw.json b/src/main/resources/assets/continuity/lang/zh_tw.json index bd4afdc1..314dde60 100644 --- a/src/main/resources/assets/continuity/lang/zh_tw.json +++ b/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": "剔除玻璃片之間的面" } From 9976372822be2e7e9936657c652336477b004ae3 Mon Sep 17 00:00:00 2001 From: Yuki <64414315+YukiAyase@users.noreply.github.com> Date: Mon, 2 Dec 2024 03:14:22 +0800 Subject: [PATCH 3/5] Will it work this time? (#552) Me being dummy head in GitHub --- .../resources/assets/continuity/lang/fil_ph.json | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/resources/assets/continuity/lang/fil_ph.json b/src/main/resources/assets/continuity/lang/fil_ph.json index 6e5b8c06..243ce8f8 100644 --- a/src/main/resources/assets/continuity/lang/fil_ph.json +++ b/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." } From 26c7a04cbba1bd33310178af9e265ddada29de65 Mon Sep 17 00:00:00 2001 From: PepperCode1 <44146161+PepperCode1@users.noreply.github.com> Date: Tue, 3 Dec 2024 20:31:56 -0800 Subject: [PATCH 4/5] Add additional CTM conditions to default pack Make sure all definitions match the texture to avoid mod compatibility issues. --- .../optifine/ctm/default/bookshelf/bookshelf.properties | 2 ++ .../optifine/ctm/default/glass/black/glass.properties | 1 + .../optifine/ctm/default/glass/black/glass_pane.properties | 1 + .../optifine/ctm/default/glass/blue/glass.properties | 1 + .../optifine/ctm/default/glass/blue/glass_pane.properties | 1 + .../optifine/ctm/default/glass/brown/glass.properties | 1 + .../optifine/ctm/default/glass/brown/glass_pane.properties | 1 + .../optifine/ctm/default/glass/cyan/glass.properties | 1 + .../optifine/ctm/default/glass/cyan/glass_pane.properties | 1 + .../optifine/ctm/default/glass/gray/glass.properties | 1 + .../optifine/ctm/default/glass/gray/glass_pane.properties | 1 + .../optifine/ctm/default/glass/green/glass.properties | 1 + .../optifine/ctm/default/glass/green/glass_pane.properties | 1 + .../optifine/ctm/default/glass/light_blue/glass.properties | 1 + .../ctm/default/glass/light_blue/glass_pane.properties | 1 + .../optifine/ctm/default/glass/light_gray/glass.properties | 1 + .../ctm/default/glass/light_gray/glass_pane.properties | 1 + .../optifine/ctm/default/glass/lime/glass.properties | 1 + .../optifine/ctm/default/glass/lime/glass_pane.properties | 1 + .../optifine/ctm/default/glass/magenta/glass.properties | 1 + .../optifine/ctm/default/glass/magenta/glass_pane.properties | 1 + .../optifine/ctm/default/glass/orange/glass.properties | 1 + .../optifine/ctm/default/glass/orange/glass_pane.properties | 1 + .../optifine/ctm/default/glass/pink/glass.properties | 1 + .../optifine/ctm/default/glass/pink/glass_pane.properties | 1 + .../optifine/ctm/default/glass/purple/glass.properties | 1 + .../optifine/ctm/default/glass/purple/glass_pane.properties | 1 + .../optifine/ctm/default/glass/red/glass.properties | 1 + .../optifine/ctm/default/glass/red/glass_pane.properties | 1 + .../optifine/ctm/default/glass/standard/glass.properties | 1 + .../optifine/ctm/default/glass/standard/glass_pane.properties | 1 + .../optifine/ctm/default/glass/tinted/glass.properties | 1 + .../optifine/ctm/default/glass/white/glass.properties | 1 + .../optifine/ctm/default/glass/white/glass_pane.properties | 1 + .../optifine/ctm/default/glass/yellow/glass.properties | 1 + .../optifine/ctm/default/glass/yellow/glass_pane.properties | 1 + .../chiseled_red_sandstone/chiseled_red_sandstone.properties | 4 +++- .../chiseled_sandstone/chiseled_sandstone.properties | 4 +++- .../sandstone/cut_red_sandstone/cut_red_sandstone.properties | 4 +++- .../default/sandstone/cut_sandstone/cut_sandstone.properties | 4 +++- .../ctm/programmer_art/bookshelf/bookshelf.properties | 2 ++ .../optifine/ctm/programmer_art/glass/black/glass.properties | 1 + .../ctm/programmer_art/glass/black/glass_pane.properties | 1 + .../optifine/ctm/programmer_art/glass/blue/glass.properties | 1 + .../ctm/programmer_art/glass/blue/glass_pane.properties | 1 + .../optifine/ctm/programmer_art/glass/brown/glass.properties | 1 + .../ctm/programmer_art/glass/brown/glass_pane.properties | 1 + .../optifine/ctm/programmer_art/glass/cyan/glass.properties | 1 + .../ctm/programmer_art/glass/cyan/glass_pane.properties | 1 + .../optifine/ctm/programmer_art/glass/gray/glass.properties | 1 + .../ctm/programmer_art/glass/gray/glass_pane.properties | 1 + .../optifine/ctm/programmer_art/glass/green/glass.properties | 1 + .../ctm/programmer_art/glass/green/glass_pane.properties | 1 + .../ctm/programmer_art/glass/light_blue/glass.properties | 1 + .../ctm/programmer_art/glass/light_blue/glass_pane.properties | 1 + .../ctm/programmer_art/glass/light_gray/glass.properties | 1 + .../ctm/programmer_art/glass/light_gray/glass_pane.properties | 1 + .../optifine/ctm/programmer_art/glass/lime/glass.properties | 1 + .../ctm/programmer_art/glass/lime/glass_pane.properties | 1 + .../ctm/programmer_art/glass/magenta/glass.properties | 1 + .../ctm/programmer_art/glass/magenta/glass_pane.properties | 1 + .../optifine/ctm/programmer_art/glass/orange/glass.properties | 1 + .../ctm/programmer_art/glass/orange/glass_pane.properties | 1 + .../optifine/ctm/programmer_art/glass/pink/glass.properties | 1 + .../ctm/programmer_art/glass/pink/glass_pane.properties | 1 + .../optifine/ctm/programmer_art/glass/purple/glass.properties | 1 + .../ctm/programmer_art/glass/purple/glass_pane.properties | 1 + .../optifine/ctm/programmer_art/glass/red/glass.properties | 1 + .../ctm/programmer_art/glass/red/glass_pane.properties | 1 + .../ctm/programmer_art/glass/standard/glass.properties | 1 + .../ctm/programmer_art/glass/standard/glass_pane.properties | 1 + .../optifine/ctm/programmer_art/glass/white/glass.properties | 1 + .../ctm/programmer_art/glass/white/glass_pane.properties | 1 + .../optifine/ctm/programmer_art/glass/yellow/glass.properties | 1 + .../ctm/programmer_art/glass/yellow/glass_pane.properties | 1 + .../chiseled_red_sandstone/chiseled_red_sandstone.properties | 4 +++- .../chiseled_sandstone/chiseled_sandstone.properties | 4 +++- .../sandstone/cut_red_sandstone/cut_red_sandstone.properties | 4 +++- .../sandstone/cut_sandstone/cut_sandstone.properties | 4 +++- 79 files changed, 97 insertions(+), 8 deletions(-) diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/bookshelf/bookshelf.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/bookshelf/bookshelf.properties index 2ec3936d..b26c3da8 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/bookshelf/bookshelf.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/black/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/black/glass.properties index ea29a681..115b7226 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/black/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/black/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/black/glass_pane.properties index da88f7e6..967b0d85 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/black/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/blue/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/blue/glass.properties index 68aaf6a7..72ad4920 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/blue/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/blue/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/blue/glass_pane.properties index 0de08a2a..0ce8185b 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/blue/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/brown/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/brown/glass.properties index 4516c023..23cbbc4b 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/brown/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/brown/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/brown/glass_pane.properties index 6bd50266..8c9afda4 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/brown/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/cyan/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/cyan/glass.properties index 67ece732..959dd6ca 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/cyan/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/cyan/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/cyan/glass_pane.properties index 20fa7372..b0baf6ed 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/cyan/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/gray/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/gray/glass.properties index 832d26cc..cc39cb2a 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/gray/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/gray/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/gray/glass_pane.properties index e958bd3b..b6d3a1b7 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/gray/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/green/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/green/glass.properties index 4911b9fb..0024fb0f 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/green/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/green/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/green/glass_pane.properties index 220574ec..e6a6b1fc 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/green/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/light_blue/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/light_blue/glass.properties index aea19682..a79a1a93 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/light_blue/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/light_blue/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/light_blue/glass_pane.properties index ed8b2372..36b430c6 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/light_blue/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/light_gray/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/light_gray/glass.properties index 91e77e2a..9ab89875 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/light_gray/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/light_gray/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/light_gray/glass_pane.properties index 290deabf..1eed6d1f 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/light_gray/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/lime/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/lime/glass.properties index f23d2b33..652b8cd2 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/lime/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/lime/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/lime/glass_pane.properties index 9310624b..7dad75e3 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/lime/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/magenta/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/magenta/glass.properties index e8226406..e50c4f6b 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/magenta/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/magenta/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/magenta/glass_pane.properties index cb38e03e..48f5a416 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/magenta/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/orange/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/orange/glass.properties index ddc2f87d..0c9072ae 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/orange/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/orange/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/orange/glass_pane.properties index 3a62de18..996e36b3 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/orange/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/pink/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/pink/glass.properties index 3ba7dc5f..cd3e54df 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/pink/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/pink/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/pink/glass_pane.properties index a23eab31..0d2dd951 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/pink/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/purple/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/purple/glass.properties index 3c3f3ecd..d4e421a2 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/purple/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/purple/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/purple/glass_pane.properties index 10d49e5c..4efa90a1 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/purple/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/red/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/red/glass.properties index a1dc7a03..f4a27d4f 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/red/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/red/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/red/glass_pane.properties index 92a5eeef..225ddde1 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/red/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/standard/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/standard/glass.properties index 71def1b7..37f79f75 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/standard/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/standard/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/standard/glass_pane.properties index 46b68c9b..798733ed 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/standard/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/tinted/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/tinted/glass.properties index e5c1e57d..fbbab8de 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/tinted/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/white/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/white/glass.properties index 797db398..249e1d36 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/white/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/white/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/white/glass_pane.properties index bac2ff76..f8d1da6d 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/white/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/yellow/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/yellow/glass.properties index 892c0e9b..7e67d124 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/yellow/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/yellow/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/yellow/glass_pane.properties index 529625dd..866c716a 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/glass/yellow/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/sandstone/chiseled_red_sandstone/chiseled_red_sandstone.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/sandstone/chiseled_red_sandstone/chiseled_red_sandstone.properties index 5a2c4e59..d13d5f19 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/sandstone/chiseled_red_sandstone/chiseled_red_sandstone.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/sandstone/chiseled_sandstone/chiseled_sandstone.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/sandstone/chiseled_sandstone/chiseled_sandstone.properties index 2100d59e..0a96b858 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/sandstone/chiseled_sandstone/chiseled_sandstone.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/sandstone/cut_red_sandstone/cut_red_sandstone.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/sandstone/cut_red_sandstone/cut_red_sandstone.properties index e85ff6ba..8282cc47 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/sandstone/cut_red_sandstone/cut_red_sandstone.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/sandstone/cut_sandstone/cut_sandstone.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/sandstone/cut_sandstone/cut_sandstone.properties index ed8779bd..53d9a79c 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/default/sandstone/cut_sandstone/cut_sandstone.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/bookshelf/bookshelf.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/bookshelf/bookshelf.properties index 0a6b4045..6e5b66b9 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/bookshelf/bookshelf.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/black/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/black/glass.properties index a65b17a9..ede8e576 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/black/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/black/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/black/glass_pane.properties index 1beaf09c..8581d15c 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/black/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/blue/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/blue/glass.properties index 289eb2cc..3e0f1242 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/blue/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/blue/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/blue/glass_pane.properties index 7fa5a770..49df9f13 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/blue/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/brown/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/brown/glass.properties index a5fd54e8..f44685a8 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/brown/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/brown/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/brown/glass_pane.properties index 3d2364a2..560d57ef 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/brown/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/cyan/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/cyan/glass.properties index 61e90a8c..09723b02 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/cyan/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/cyan/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/cyan/glass_pane.properties index 6b6d639b..3c23f424 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/cyan/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/gray/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/gray/glass.properties index 7fce99e2..dbfdc0af 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/gray/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/gray/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/gray/glass_pane.properties index cd40c07f..e617f419 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/gray/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/green/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/green/glass.properties index d4e181bf..3f6c3673 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/green/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/green/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/green/glass_pane.properties index 96708762..ea03d041 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/green/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/light_blue/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/light_blue/glass.properties index fa227956..c91088d9 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/light_blue/glass.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/light_blue/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/light_blue/glass_pane.properties index 947d5a28..cf0cb753 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/light_blue/glass_pane.properties +++ b/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/light_gray/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/light_gray/glass.properties index 4709dd2e..c00da6e3 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/light_gray/glass.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/light_gray/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/light_gray/glass_pane.properties index e09d727c..658aa246 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/light_gray/glass_pane.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/lime/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/lime/glass.properties index b42eac4e..230955ff 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/lime/glass.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/lime/glass.properties @@ -1,4 +1,5 @@ method=ctm +matchTiles=lime_stained_glass matchBlocks=lime_stained_glass tiles=0-46 connect=block diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/lime/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/lime/glass_pane.properties index 4ba702ea..73f5b3df 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/lime/glass_pane.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/magenta/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/magenta/glass.properties index c46d45f2..da50c514 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/magenta/glass.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/magenta/glass.properties @@ -1,4 +1,5 @@ method=ctm +matchTiles=magenta_stained_glass matchBlocks=magenta_stained_glass tiles=0-46 connect=block diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/magenta/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/magenta/glass_pane.properties index 30c8cfdc..fa4de86f 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/magenta/glass_pane.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/orange/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/orange/glass.properties index a931f4c5..a055a75b 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/orange/glass.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/orange/glass.properties @@ -1,4 +1,5 @@ method=ctm +matchTiles=orange_stained_glass matchBlocks=orange_stained_glass tiles=0-46 connect=block diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/orange/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/orange/glass_pane.properties index a73e2fb4..de4aec1c 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/orange/glass_pane.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/pink/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/pink/glass.properties index fd0f0fdc..47f53e6c 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/pink/glass.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/pink/glass.properties @@ -1,4 +1,5 @@ method=ctm +matchTiles=pink_stained_glass matchBlocks=pink_stained_glass tiles=0-46 connect=block diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/pink/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/pink/glass_pane.properties index 239c436c..a5278a6d 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/pink/glass_pane.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/purple/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/purple/glass.properties index b4f0ef95..eb5891f5 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/purple/glass.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/purple/glass.properties @@ -1,4 +1,5 @@ method=ctm +matchTiles=purple_stained_glass matchBlocks=purple_stained_glass tiles=0-46 connect=block diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/purple/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/purple/glass_pane.properties index 576506b8..842fde37 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/purple/glass_pane.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/red/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/red/glass.properties index 715c8030..e44d6dfe 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/red/glass.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/red/glass.properties @@ -1,4 +1,5 @@ method=ctm +matchTiles=red_stained_glass matchBlocks=red_stained_glass tiles=0-46 connect=block diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/red/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/red/glass_pane.properties index 320642b9..a4a577e3 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/red/glass_pane.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/standard/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/standard/glass.properties index 18463930..c3db29d9 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/standard/glass.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/standard/glass.properties @@ -1,4 +1,5 @@ method=ctm +matchTiles=glass matchBlocks=glass tiles=0-46 connect=block diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/standard/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/standard/glass_pane.properties index a62e2b6a..3ff10ccb 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/standard/glass_pane.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/standard/glass_pane.properties @@ -1,4 +1,5 @@ method=ctm +matchTiles=glass matchBlocks=glass_pane tiles=0-46 faces=sides diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/white/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/white/glass.properties index 9a468f80..98884e2a 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/white/glass.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/white/glass.properties @@ -1,4 +1,5 @@ method=ctm +matchTiles=white_stained_glass matchBlocks=white_stained_glass tiles=0-46 connect=block diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/white/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/white/glass_pane.properties index 9fdcc69a..a9e633d7 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/white/glass_pane.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/yellow/glass.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/yellow/glass.properties index 5ad33d0f..bca5aab1 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/yellow/glass.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/yellow/glass.properties @@ -1,4 +1,5 @@ method=ctm +matchTiles=yellow_stained_glass matchBlocks=yellow_stained_glass tiles=0-46 connect=block diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/yellow/glass_pane.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/yellow/glass_pane.properties index cfa00e6e..6b7c6f4a 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/glass/yellow/glass_pane.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/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 diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/sandstone/chiseled_red_sandstone/chiseled_red_sandstone.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/sandstone/chiseled_red_sandstone/chiseled_red_sandstone.properties index 9a15a382..0669af40 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/sandstone/chiseled_red_sandstone/chiseled_red_sandstone.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/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@programmer_art diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/sandstone/chiseled_sandstone/chiseled_sandstone.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/sandstone/chiseled_sandstone/chiseled_sandstone.properties index 4e49b63d..d7d2af6f 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/sandstone/chiseled_sandstone/chiseled_sandstone.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/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@programmer_art diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/sandstone/cut_red_sandstone/cut_red_sandstone.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/sandstone/cut_red_sandstone/cut_red_sandstone.properties index e0cbf5d5..e874a400 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/sandstone/cut_red_sandstone/cut_red_sandstone.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/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@programmer_art diff --git a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/sandstone/cut_sandstone/cut_sandstone.properties b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/sandstone/cut_sandstone/cut_sandstone.properties index 7dff90bc..56278ea4 100644 --- a/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/sandstone/cut_sandstone/cut_sandstone.properties +++ b/src/main/resources/resourcepacks/default/assets/continuity/optifine/ctm/programmer_art/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@programmer_art From 9d73e905777c700dd701bf995a87ea3fce4ce197 Mon Sep 17 00:00:00 2001 From: PepperCode1 <44146161+PepperCode1@users.noreply.github.com> Date: Tue, 3 Dec 2024 20:32:25 -0800 Subject: [PATCH 5/5] Bump version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d380f8d9..74de0e99 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ yarn_mappings = 1.19.3+build.5 loader_version = 0.15.10 # Mod Properties -mod_version = 3.0.0-beta.6 +mod_version = 3.0.0 mod_minecraft_version = 1.19.3 maven_group = me.pepperbell archives_base_name = continuity