Skip to content

Commit a7aba15

Browse files
authored
Sync Offical Version 3.1.0.148 (#18)
* update * delete some fucking ai generated code * update * sync my code * fix bug bug bug
1 parent 3f0e1f9 commit a7aba15

5,478 files changed

Lines changed: 47613 additions & 11832 deletions

File tree

Some content is hidden

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

.github/workflows/gradle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: TinkersConstruct-Modern Build
1+
name: GregTech-Construct Build
22

33
on:
44
push:

dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ dependencies {
1414

1515
modCompileOnly("blusunrize.immersiveengineering:ImmersiveEngineering:${minecraft_version}-${ie_version}")
1616
modRuntimeOnly("curse.maven:MoonlightLib-499980:6000197")
17-
modRuntimeOnly("curse.maven:MmmMmmMmmMmm-225738:5737040")
1817

1918
modCompileOnly("curse.maven:diet-443570:4813904")
2019

2120
modImplementation("com.gregtechceu.gtceu:gtceu-${minecraft_version}:${gtceu_version}:slim") { transitive = false }
2221
modImplementation("com.lowdragmc.ldlib:ldlib-forge-${minecraft_version}:${ldlib_version}") { transitive = false }
2322
modImplementation("com.tterrag.registrate:Registrate:${registrate_version}")
2423
modImplementation("dev.toma.configuration:configuration-forge-${minecraft_version}:${configuration_version}")
24+
modImplementation("curse.maven:MmmMmmMmmMmm-225738:5737040")
2525

2626
modCompileOnly("dev.gigaherz.jsonthings:JsonThings-${minecraft_version}:${json_things_version}")
2727

gradle.properties

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ org.gradle.caching = true
88
#systemProp.https.proxyHost=127.0.0.1
99
#systemProp.https.proxyPort=7897
1010
# Mod Properties
11-
mod_version=3.10.3.2
11+
mod_version=3.11.0.148
1212
maven_group=slimeknights.construct
1313
archives_base_name=GregTech-Construct
1414
mod_id=tconstruct
@@ -20,22 +20,26 @@ mod_license=MIT
2020

2121
# Base properties
2222
# minecraft version
23-
minecraft_version=1.20.1
24-
minecraft_range=[1.20.1,1.20.2)
23+
2524
# forge version, latest version can be found on https://files.minecraftforge.net/
2625
mapping_channel=parchment
2726
mapping_version=2023.09.03
2827

28+
# Minecraft Version Information
29+
minecraft_base_version=1.20
30+
minecraft_version=1.20.1
31+
minecraft_range=[1.20.1,1.20.2)
32+
2933
# Forge Version Information
34+
forge_version=47.4.0
3035
# Support "any" forge version to ensure we support Neo too
31-
forge_version=47.4.1
32-
loader_range=[40,)
33-
forge_range=[47.4.1,)
36+
loader_range=*
37+
forge_range=*
3438
parchment_version=2023.09.03
3539

3640
# Build Dependencies
37-
mantle_version=1.11.78
38-
mantle_range=[1.11.78,)
41+
mantle_version=1.11.94
42+
mantle_range=[1.11.94,)
3943

4044
# Optional compat
4145
jei_version=15.20.+

src/generated/resources/assets/minecraft/atlases/armor_trims.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/generated/resources/assets/minecraft/atlases/blocks.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/generated/resources/assets/tconstruct/blockstates/nichrome_fluid.json renamed to src/generated/resources/assets/tconstruct/blockstates/bendalloy_fluid.json

File renamed without changes.

src/main/resources/assets/tconstruct/blockstates/budding_earth_slime_crystal.json renamed to src/generated/resources/assets/tconstruct/blockstates/budding_earth_slime_crystal.json

File renamed without changes.

src/main/resources/assets/tconstruct/blockstates/budding_ender_slime_crystal.json renamed to src/generated/resources/assets/tconstruct/blockstates/budding_ender_slime_crystal.json

File renamed without changes.

src/main/resources/assets/tconstruct/blockstates/budding_ichor_slime_crystal.json renamed to src/generated/resources/assets/tconstruct/blockstates/budding_ichor_slime_crystal.json

File renamed without changes.

src/main/resources/assets/tconstruct/blockstates/budding_sky_slime_crystal.json renamed to src/generated/resources/assets/tconstruct/blockstates/budding_sky_slime_crystal.json

File renamed without changes.

0 commit comments

Comments
 (0)