Skip to content

Commit 80f742e

Browse files
PepperCode1PepperCode1
committed
Merge branch 'refs/heads/1.19.4/dev' into 1.20.1/dev
# Conflicts: # gradle.properties
2 parents a52f35c + 427f250 commit 80f742e

File tree

83 files changed

+117
-16
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+117
-16
lines changed

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ yarn_mappings = 1.20.1+build.10
99
loader_version = 0.15.10
1010

1111
# Mod Properties
12-
mod_version = 3.0.0-beta.6
12+
mod_version = 3.0.0
1313
mod_minecraft_version = 1.20.1
1414
maven_group = me.pepperbell
1515
archives_base_name = continuity

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
{
22
"options.continuity.title": "Pagsasaayos ng Continuity",
3-
"options.continuity.connected_textures": "Konektado na mga Textures",
4-
"options.continuity.connected_textures.tooltip": "Paganahin o hindi paganahin ang mga konektadong textures sa mga bloke.",
5-
"options.continuity.emissive_textures": "Emisibo na mga Textures",
6-
"options.continuity.emissive_textures.tooltip": "Paganahin o hindi paganahin ang mga emisibong textures sa mga bloke at modelong aytem.",
3+
"options.continuity.connected_textures": "Konektado na mga Testura",
4+
"options.continuity.connected_textures.tooltip": "Paganahin o hindi paganahin ang mga konektadong testura sa mga bloke.",
5+
"options.continuity.emissive_textures": "Emisibo na mga Testura",
6+
"options.continuity.emissive_textures.tooltip": "Paganahin o hindi paganahin ang mga emisibong testura sa mga bloke at modelong aytem.",
77
"options.continuity.custom_block_layers": "Mga Pasadyang Suson",
8-
"options.continuity.custom_block_layers.tooltip": "Paganahin o hindi paganahin ang mga pasadyang suson."
8+
"options.continuity.custom_block_layers.tooltip": "Paganahin o hindi paganahin ang mga pasadyang suson.",
9+
"resourcePack.continuity.default.name": "Default na Konektadong mga Testura",
10+
"resourcePack.continuity.default.description": "Salamin, batong buhangin, mga bookshelf",
11+
"resourcePack.continuity.glass_pane_culling_fix.name": "Pag-aayos sa gitnang panig ng salamin",
12+
"resourcePack.continuity.glass_pane_culling_fix.description": "Tanggalin ang linya sa gitnang panig ng salamin."
913
}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,9 @@
55
"options.continuity.emissive_textures": "Tekstury emisyjne",
66
"options.continuity.emissive_textures.tooltip": "Włącz lub wyłącz tekstury emisyjne dla bloków i modeli przedmiotów.",
77
"options.continuity.custom_block_layers": "Niestandardowe warstwy bloków",
8-
"options.continuity.custom_block_layers.tooltip": "Włącz lub wyłącz niestandardowe warstwy bloków."
8+
"options.continuity.custom_block_layers.tooltip": "Włącz lub wyłącz niestandardowe warstwy bloków.",
9+
"resourcePack.continuity.default.name": "Domyślne połączone tekstury",
10+
"resourcePack.continuity.default.description": "Szkło, piaskowiec, biblioteczki",
11+
"resourcePack.continuity.glass_pane_culling_fix.name": "Poprawka chowania szyb",
12+
"resourcePack.continuity.glass_pane_culling_fix.description": "Chowanie ścian pomiędzy szybami"
913
}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,9 @@
55
"options.continuity.emissive_textures": "高光紋理",
66
"options.continuity.emissive_textures.tooltip": "啟用或停用方塊和物品模型的高光紋理。",
77
"options.continuity.custom_block_layers": "自訂方塊層",
8-
"options.continuity.custom_block_layers.tooltip": "啟用或停用自訂方塊層。"
8+
"options.continuity.custom_block_layers.tooltip": "啟用或停用自訂方塊層。",
9+
"resourcePack.continuity.default.name": "預設連接紋理",
10+
"resourcePack.continuity.default.description": "玻璃、砂岩、書櫃",
11+
"resourcePack.continuity.glass_pane_culling_fix.name": "玻璃片剔除修正",
12+
"resourcePack.continuity.glass_pane_culling_fix.description": "剔除玻璃片之間的面"
913
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
method=horizontal
2+
matchTiles=bookshelf
23
matchBlocks=bookshelf
34
tiles=0-3
45
faces=sides
6+
connect=block
57
resourceCondition=textures/block/bookshelf.png

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
method=ctm
2+
matchTiles=black_stained_glass
23
matchBlocks=black_stained_glass
34
tiles=0-46
45
connect=block

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
method=ctm
2+
matchTiles=black_stained_glass
23
matchBlocks=black_stained_glass_pane
34
tiles=0-46
45
faces=sides

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
method=ctm
2+
matchTiles=blue_stained_glass
23
matchBlocks=blue_stained_glass
34
tiles=0-46
45
connect=block

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
method=ctm
2+
matchTiles=blue_stained_glass
23
matchBlocks=blue_stained_glass_pane
34
tiles=0-46
45
faces=sides

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
method=ctm
2+
matchTiles=brown_stained_glass
23
matchBlocks=brown_stained_glass
34
tiles=0-46
45
connect=block

0 commit comments

Comments
 (0)