Skip to content

Commit 97c80ca

Browse files
AViewFromTheTopAViewFromTheTop
committed
Merge branch 'main' into 1.21.10
2 parents 332bd76 + b0419e7 commit 97c80ca

File tree

65 files changed

+178
-72
lines changed

Some content is hidden

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

65 files changed

+178
-72
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
Please clear changelog after each release.
22
Put the changelog BELOW the dashes. ANYTHING ABOVE IS IGNORED.
33
-----------------
4-
- Fixed Weighted Pressure Plates not dropping when broken.
5-
- Fixed Copper and Redstone Jack o'Lanterns not using the cutout render layer, which made them render incorrectly with Glowtone.
4+
- Changed the damage thresholds at which Copper Equipment oxidizes, in order to make the Copper tier have more gameplay impact.
5+
- Keep in mind each oxidization stage moves the equipment's stats toward Iron, with the last having Iron's stats.
6+
- Exposed: 45% -> 20%
7+
- Weathered: 65% -> 45%
8+
- Oxidized: 85% -> 65%
9+
- Added improved textures for all oxidizing items and armor in the internal `Copperier Copper` resource pack.
10+
- Added improved Copper Horse Armor item, Copper Nautilus Armor item, and Copper Nautilus Armor textures in the internal `Copperier Copper` resource pack.
11+
- The internal `Green Copper Bulbs` resource pack now makes the eyes of Copper Golems green.
12+
- Added a Polish translation!

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ buildscript {
1818
}
1919

2020
plugins {
21-
id("fabric-loom") version("1.11-SNAPSHOT")
21+
id("fabric-loom") version("1.14-SNAPSHOT")
2222
id("org.quiltmc.gradle.licenser") version("+")
2323
id("org.ajoberstar.grgit") version("+")
2424
id("com.modrinth.minotaur") version("+")

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616

1717
# Mod Properties
1818
mod_id = thecopperierage
19-
mod_version = 1.0.5
19+
mod_version = 1.0.6
2020
# protocol version must be changed after each update with dual env changes
2121
protocol_version = 1
2222
maven_group = net.frozenblock
2323
archives_base_name = TheCopperierAge
2424

2525
# Dependencies
2626
fabric_api_version=0.134.1+1.21.10
27-
frozenlib_version=2.2.1-mc1.21.10
27+
frozenlib_version=2.2.4-mc1.21.10
2828
# External Mods
2929
modmenu_version=15.0.0-beta.3
3030
cloth_config_version=19.0.147

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎src/main/generated/assets/minecraft/items/brush.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515
"type": "minecraft:model",
1616
"model": "thecopperierage:item/brush_exposed_brushing_0"
1717
},
18-
"threshold": 0.45
18+
"threshold": 0.2
1919
},
2020
{
2121
"model": {
2222
"type": "minecraft:model",
2323
"model": "thecopperierage:item/brush_weathered_brushing_0"
2424
},
25-
"threshold": 0.65
25+
"threshold": 0.45
2626
},
2727
{
2828
"model": {
2929
"type": "minecraft:model",
3030
"model": "thecopperierage:item/brush_oxidized_brushing_0"
3131
},
32-
"threshold": 0.85
32+
"threshold": 0.65
3333
}
3434
],
3535
"fallback": {
@@ -62,21 +62,21 @@
6262
"type": "minecraft:model",
6363
"model": "thecopperierage:item/brush_exposed_brushing_1"
6464
},
65-
"threshold": 0.45
65+
"threshold": 0.2
6666
},
6767
{
6868
"model": {
6969
"type": "minecraft:model",
7070
"model": "thecopperierage:item/brush_weathered_brushing_1"
7171
},
72-
"threshold": 0.65
72+
"threshold": 0.45
7373
},
7474
{
7575
"model": {
7676
"type": "minecraft:model",
7777
"model": "thecopperierage:item/brush_oxidized_brushing_1"
7878
},
79-
"threshold": 0.85
79+
"threshold": 0.65
8080
}
8181
],
8282
"fallback": {
@@ -109,21 +109,21 @@
109109
"type": "minecraft:model",
110110
"model": "thecopperierage:item/brush_exposed_brushing_2"
111111
},
112-
"threshold": 0.45
112+
"threshold": 0.2
113113
},
114114
{
115115
"model": {
116116
"type": "minecraft:model",
117117
"model": "thecopperierage:item/brush_weathered_brushing_2"
118118
},
119-
"threshold": 0.65
119+
"threshold": 0.45
120120
},
121121
{
122122
"model": {
123123
"type": "minecraft:model",
124124
"model": "thecopperierage:item/brush_oxidized_brushing_2"
125125
},
126-
"threshold": 0.85
126+
"threshold": 0.65
127127
}
128128
],
129129
"fallback": {
@@ -156,21 +156,21 @@
156156
"type": "minecraft:model",
157157
"model": "thecopperierage:item/brush_exposed"
158158
},
159-
"threshold": 0.45
159+
"threshold": 0.2
160160
},
161161
{
162162
"model": {
163163
"type": "minecraft:model",
164164
"model": "thecopperierage:item/brush_weathered"
165165
},
166-
"threshold": 0.65
166+
"threshold": 0.45
167167
},
168168
{
169169
"model": {
170170
"type": "minecraft:model",
171171
"model": "thecopperierage:item/brush_oxidized"
172172
},
173-
"threshold": 0.85
173+
"threshold": 0.65
174174
}
175175
],
176176
"fallback": {

‎src/main/generated/assets/minecraft/items/copper_axe.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111
"type": "minecraft:model",
1212
"model": "thecopperierage:item/copper_axe_exposed"
1313
},
14-
"threshold": 0.45
14+
"threshold": 0.2
1515
},
1616
{
1717
"model": {
1818
"type": "minecraft:model",
1919
"model": "thecopperierage:item/copper_axe_weathered"
2020
},
21-
"threshold": 0.65
21+
"threshold": 0.45
2222
},
2323
{
2424
"model": {
2525
"type": "minecraft:model",
2626
"model": "thecopperierage:item/copper_axe_oxidized"
2727
},
28-
"threshold": 0.85
28+
"threshold": 0.65
2929
}
3030
],
3131
"fallback": {

‎src/main/generated/assets/minecraft/items/copper_boots.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
},
9595
"property": "minecraft:trim_material"
9696
},
97-
"threshold": 0.45
97+
"threshold": 0.2
9898
},
9999
{
100100
"model": {
@@ -184,7 +184,7 @@
184184
},
185185
"property": "minecraft:trim_material"
186186
},
187-
"threshold": 0.65
187+
"threshold": 0.45
188188
},
189189
{
190190
"model": {
@@ -274,7 +274,7 @@
274274
},
275275
"property": "minecraft:trim_material"
276276
},
277-
"threshold": 0.85
277+
"threshold": 0.65
278278
}
279279
],
280280
"fallback": {

‎src/main/generated/assets/minecraft/items/copper_chestplate.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
},
9595
"property": "minecraft:trim_material"
9696
},
97-
"threshold": 0.45
97+
"threshold": 0.2
9898
},
9999
{
100100
"model": {
@@ -184,7 +184,7 @@
184184
},
185185
"property": "minecraft:trim_material"
186186
},
187-
"threshold": 0.65
187+
"threshold": 0.45
188188
},
189189
{
190190
"model": {
@@ -274,7 +274,7 @@
274274
},
275275
"property": "minecraft:trim_material"
276276
},
277-
"threshold": 0.85
277+
"threshold": 0.65
278278
}
279279
],
280280
"fallback": {

‎src/main/generated/assets/minecraft/items/copper_helmet.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
},
9595
"property": "minecraft:trim_material"
9696
},
97-
"threshold": 0.45
97+
"threshold": 0.2
9898
},
9999
{
100100
"model": {
@@ -184,7 +184,7 @@
184184
},
185185
"property": "minecraft:trim_material"
186186
},
187-
"threshold": 0.65
187+
"threshold": 0.45
188188
},
189189
{
190190
"model": {
@@ -274,7 +274,7 @@
274274
},
275275
"property": "minecraft:trim_material"
276276
},
277-
"threshold": 0.85
277+
"threshold": 0.65
278278
}
279279
],
280280
"fallback": {

‎src/main/generated/assets/minecraft/items/copper_hoe.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111
"type": "minecraft:model",
1212
"model": "thecopperierage:item/copper_hoe_exposed"
1313
},
14-
"threshold": 0.45
14+
"threshold": 0.2
1515
},
1616
{
1717
"model": {
1818
"type": "minecraft:model",
1919
"model": "thecopperierage:item/copper_hoe_weathered"
2020
},
21-
"threshold": 0.65
21+
"threshold": 0.45
2222
},
2323
{
2424
"model": {
2525
"type": "minecraft:model",
2626
"model": "thecopperierage:item/copper_hoe_oxidized"
2727
},
28-
"threshold": 0.85
28+
"threshold": 0.65
2929
}
3030
],
3131
"fallback": {

0 commit comments

Comments
 (0)