Skip to content

Commit

Permalink
feat: update to 1.20.6 (#182)
Browse files Browse the repository at this point in the history
* chore: update github actions workflow

* chore: update gradle wrapper

* feat: update gradle and neoforge metadata

* feat: update geckolib

* feat: update networking

* feat: start working on updating recipes

* feat: finish recipes update

* feat: update particles

* feat: update hud

* chore: re-establish reuse compliance

* feat: update fluid and item stack comparison

* feat: update crafted checks

* feat: update nbt loot drop to component drop

* feat: update worldgen

* feat: update jade

* feat: update modo pages

* feat: update event registration

* feat: update blockentities

* feat: various smaller updates

* feat: update divination rod message to use data components

* feat: update logistics manager classes

* feat: update fluid stuff

* feat: update datagen

* feat: update wire end point data comp

* feat: fix block use

* feat: update block use

* feat: use data components

* feat: update logistics item connector target selection to use data components

* feat: update sulfur to use data components

* feat: update divination rod

* chore: run datagen

* feat: cleanup json recipe gen parent

* feat: clean up shaped recipe provider

* feat: cleanup shapeless recipe provider

* feat: cleanup smelting recipe provider

* feat: cleanup accumulation and calcination provider

* feat: clean up digestion recipe provider

* feat: clean up Distillation recipe provider

* feat: clean up refmentation recipe provider

* feat: clean up incubation recipe provider

* feat: clean up liquefaction recipe provider

* feat: clean up reformation recipe provider

* fix: invalid null param

* fix: calcination recipes

* chore: run datagen

* fix: recipe cleanup issues

* fix: pre-migration tags
  • Loading branch information
klikli-dev committed May 31, 2024
1 parent b1e4ccd commit 7998a36
Show file tree
Hide file tree
Showing 636 changed files with 6,259 additions and 6,027 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build_and_publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set up OpenJDK 17
- name: Set up OpenJDK 21
uses: actions/setup-java@v3
with:
java-version: 17
java-version: 21
distribution: temurin
- name: Get release type from github tag
id: get_release_type
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
uses: stefanzweifel/git-auto-commit-action@v4
if: ${{ steps.get_release_type.outputs.result != 'test' }}
with:
branch: version/1.20.4
branch: version/1.20.6
commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]'
file_pattern: CHANGELOG.md
- name: Upload to Mod Platforms
Expand Down
42 changes: 29 additions & 13 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,15 @@ sourceSets {
main {
java {
exclude '**/AlmostUnifiedIntegrationImpl.java'
exclude '**/jade/**/*.java'
// exclude '**/jade/**/*.java'
exclude '**/jei/**/*.java'
}
}
}


// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
java.toolchain.languageVersion = JavaLanguageVersion.of(21)
java.withSourcesJar()


if (file('src/main/resources/META-INF/accesstransformer.cfg').exists()) {
minecraft.accessTransformers.file file('src/main/resources/META-INF/accesstransformer.cfg')
}
Expand Down Expand Up @@ -59,6 +57,15 @@ runs {
// Include resources generated by data generators.
sourceSets.main.resources { srcDir 'src/generated/resources' }

// Sets up a dependency configuration called 'localRuntime'.
// This configuration should be used instead of 'runtimeOnly' to declare
// a dependency that will be present for runtime testing but that is
// "optional", meaning it will not be pulled by dependents of this mod.
configurations {
runtimeClasspath.extendsFrom localRuntime
}


repositories {
maven {
url "https://dl.cloudsmith.io/public/klikli-dev/mods/maven/"
Expand Down Expand Up @@ -98,12 +105,14 @@ repositories {

dependencies {
implementation "net.neoforged:neoforge:${neo_version}"

//TODO: enable once available
//Jei
compileOnly "mezz.jei:jei-${minecraft_version}-common-api:${jei_version}"
compileOnly "mezz.jei:jei-${minecraft_version}-common:${jei_version}"
//we're using the vanilla recipe category rendering constants
compileOnly "mezz.jei:jei-${minecraft_version}-neoforge-api:${jei_version}"
runtimeOnly "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}"
// compileOnly "mezz.jei:jei-${minecraft_version}-common-api:${jei_version}"
// compileOnly "mezz.jei:jei-${minecraft_version}-common:${jei_version}"
// //we're using the vanilla recipe category rendering constants
// compileOnly "mezz.jei:jei-${minecraft_version}-neoforge-api:${jei_version}"
// runtimeOnly "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}"

//TODO: enable once available
//almostunified
Expand All @@ -116,12 +125,11 @@ dependencies {
implementation "com.klikli_dev:modonomicon-${minecraft_version}-neoforge:${modonomicon_version}"

//Jade (Hwyla/Waila)
//TODO: enable once available
// implementation "maven.modrinth:jade:${jade_version}"
implementation "maven.modrinth:jade:${jade_version}+neoforge"
}

processResources {
filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
filesMatching(['META-INF/neoforge.mods.toml']) {
expand project.properties
}
}
Expand Down Expand Up @@ -190,3 +198,11 @@ afterEvaluate {
options.compilerArgs << "-Xmaxerrs" << "2000"
}
}

// IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior.
idea {
module {
downloadSources = true
downloadJavadoc = true
}
}
32 changes: 16 additions & 16 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,47 +7,47 @@ systemProp.net.minecraftforge.gradle.check.certs=false
## Environment Properties

# The Minecraft version must agree with the Forge version to get a valid artifact
minecraft_version=1.20.4
minecraft_version=1.20.6
# The Minecraft version range can use any release version of Minecraft as bounds.
# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
# as they do not follow standard versioning conventions.
minecraft_version_range=[1.20.4,1.21)
minecraft_version_range=[1.20.6,1.21)

## Neo
# The neo version must agree with the Minecraft version to get a valid artifact
neo_version=20.4.119-beta
neo_version=20.6.96-beta
# The neo version range can use any version of neo as bounds or match the loader version range
neo_version_range=[20.4.80-beta,)
neo_version_range=[20.6.96-beta,)
# The loader version range can only use the major version of Neo/FML as bounds
neo_loader_version_range=[2,)
neogradle_version=7.0.84
neo_loader_version_range=[3,)
neogradle_version=7.0.134

# neo directly reads these properties
# the version the mappings were created for, does not need to match the current mc version
neogradle.subsystems.parchment.minecraftVersion=1.20.3
neogradle.subsystems.parchment.minecraftVersion=1.20.6
# the mapping version
neogradle.subsystems.parchment.mappingsVersion=2023.12.31
neogradle.subsystems.parchment.mappingsVersion=2024.05.01

## Mod Properties
group=com.klikli_dev
mod_id=theurgy
mod_name=Theurgy
mod_license=MIT AND CC-BY-4.0
mod_version=1.11.0
mod_version=1.18.3
mod_authors=Kli Kli
mod_description=An open-source magic mod built around classical alchemy to replicate and transmute matter, and create magical artifacts.

## Dependency Properties

jei_version=17.0.0.30
jei_version_range=[17.0.0.30,)
modonomicon_version=1.60.0
modonomicon_version_range=[1.60.0,)
modonomicon_version=1.72.0
modonomicon_version_range=[1.72.0,)
almost_unified_version=0.5.0
almost_unified_version_range=[0.5.0,)
# geckolib currently names their files after 1.20
geckolib_minecraft_version=1.20.4
geckolib_version=4.4.1
geckolib_version_range=[4.4.1,)
jade_version=13.3.1
jade_version_range=[13.3.1,)
geckolib_minecraft_version=1.20.6
geckolib_version=4.5.2
geckolib_version_range=[4.5.2,)
jade_version=14.2.3
jade_version_range=[14.2.3,)
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.4 2024-01-16T15:38:38.1742182 Registries
// 1.20.6 2024-05-30T10:41:42.0423743 Registries
744153a8b0875b5e2ac142292159f46c322cf09c data/theurgy/neoforge/biome_modifier/add_sal_ammoniac_ore.json
eed8cd1911e09af63a869a86d83ab846401194f9 data/theurgy/worldgen/configured_feature/sal_ammoniac_ore.json
3983ae18720546d5efb83e7ac1aa81c774492d63 data/theurgy/worldgen/placed_feature/sal_ammoniac_ore.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.4 2024-01-16T15:38:38.1732174 Multiblocks: theurgy
// 1.20.6 2024-05-30T10:41:42.0423743 Multiblocks: theurgy
063aa91958795c57f58083ca62e775e9476a9407 data/theurgy/modonomicon/multiblocks/placement/calcination_oven.json
c480adc4c7baf9ba5321c4ee48193369676f8762 data/theurgy/modonomicon/multiblocks/placement/distiller.json
b9d8372529ac674469f93113632ad36c34e3a053 data/theurgy/modonomicon/multiblocks/placement/incubator.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.4 2024-05-25T19:06:57.8545531 Books: theurgy
// 1.20.6 2024-05-30T10:41:42.0276094 Books: theurgy
945f222b9db8c0781d05b5a13138c18620a0edc3 data/theurgy/modonomicon/books/the_hermetica/book.json
f44f61550bc8611d61016c6476b88448c0fe9f00 data/theurgy/modonomicon/books/the_hermetica/categories/apparatus.json
49226efd8791cdb701bf00d7af65fff59b8c6df6 data/theurgy/modonomicon/books/the_hermetica/categories/getting_started.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
// 1.20.4 2024-05-25T13:38:47.7936853 Calcination Recipes
bf2f7ab6aa2aad16c35ef79bdc255fe4b6ff4404 data/theurgy/recipes/calcination/crops.json
39c1b59033b2f9587873bb53bcf47dd7de5c8cfc data/theurgy/recipes/calcination/mineral.json
ec3ffca30544465cb45de3dfb37424586832668a data/theurgy/recipes/calcination/mineral_from_gems.json
d34c225c052338b1501bcbd21e043231ac44f7f7 data/theurgy/recipes/calcination/mineral_from_ingots.json
b07344a18bbda6b38d70991a97148a255dbb7a18 data/theurgy/recipes/calcination/mineral_from_ores.json
5d47d2529cb79f3f62fa2159fccce5f0c28f1d4f data/theurgy/recipes/calcination/mineral_from_other_minerals.json
51f6237a8c17977cd15997e803a4e978e8d1d036 data/theurgy/recipes/calcination/mineral_from_raw_materials.json
a82594b79405cbc12e26262c3d5fe18130d61e68 data/theurgy/recipes/calcination/strata_from_clay.json
2afba9157ca93d0be647a5b26053d198d40601e5 data/theurgy/recipes/calcination/strata_from_clay_ball.json
0e62f8e438f8a1fa1fa48a6187fa8c484c00aeaa data/theurgy/recipes/calcination/strata_from_cobblestone.json
43616593ea63d7084241129deb36a3c73db08ce4 data/theurgy/recipes/calcination/strata_from_dirt.json
21d88699cbff100e85eb3d4e6cdc7c8c45c81fa4 data/theurgy/recipes/calcination/strata_from_gravel.json
e1f604548adf81e5ab8edeff92d309bfcce31a06 data/theurgy/recipes/calcination/strata_from_sand.json
f69c12741f0e9caf5a708d900f83df39d04d8802 data/theurgy/recipes/calcination/strata_from_sandstone.json
ba46b01764d94e57c7a7973da74e4cd57679fad1 data/theurgy/recipes/calcination/strata_from_stone.json
// 1.20.6 2024-05-30T16:55:47.9636051 Calcination Recipes
acaf947e00babf9dab39ffbbeb087ff285b8e0a7 data/theurgy/recipes/calcination/alchemical_salt_crops.json
a0c2b8a348e4dee4e9115059b1acb177b04b9285 data/theurgy/recipes/calcination/alchemical_salt_mineral.json
5b06c236f53d103c2184037dc85630fbcf3a1092 data/theurgy/recipes/calcination/alchemical_salt_mineral_from_gems.json
432ea41ebf8319d6814f38e909c41f1c4a47acf7 data/theurgy/recipes/calcination/alchemical_salt_mineral_from_ingots.json
88b8236f812da561c9f7c906c7b9961ba4ee74b5 data/theurgy/recipes/calcination/alchemical_salt_mineral_from_ores.json
2044ecd1b1b20e3374e67be6f26b7fe5459affd1 data/theurgy/recipes/calcination/alchemical_salt_mineral_from_other_minerals.json
20c857ac6b657a18d35960c4b88f0d330e63488b data/theurgy/recipes/calcination/alchemical_salt_mineral_from_raw_materials.json
dc52856e4264056e389018ccdd9e024c44bfe3ce data/theurgy/recipes/calcination/alchemical_salt_strata_from_clay.json
c9c8e1089a1fa1fdf8a2d5fbe6123496a14f71e0 data/theurgy/recipes/calcination/alchemical_salt_strata_from_clay_ball.json
a6ffa53646cc8209a5de72eb740f15971b387d81 data/theurgy/recipes/calcination/alchemical_salt_strata_from_cobblestone.json
362241ce8e8947b89297e571ac7cf791f2a606e2 data/theurgy/recipes/calcination/alchemical_salt_strata_from_dirt.json
8f39086edc7c4d6bdc01ff9d00d044f6d856480d data/theurgy/recipes/calcination/alchemical_salt_strata_from_gravel.json
831c6ce81ba9871fedbb14b535554a7dc3ac432e data/theurgy/recipes/calcination/alchemical_salt_strata_from_sand.json
581669a38a89a9239cb8f03487e5e4b21728bf61 data/theurgy/recipes/calcination/alchemical_salt_strata_from_sandstone.json
4f95b7a95c32c46cfc28c06d13a524842150819e data/theurgy/recipes/calcination/alchemical_salt_strata_from_stone.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.4 2024-05-11T09:59:44.5162451 Block States: theurgy
// 1.20.6 2024-05-30T10:41:42.0408669 Block States: theurgy
ef875fc2604f4f19d7604536c66d3d2c26163879 assets/theurgy/blockstates/calcination_oven.json
fa912507f89d2fe9ac05c8b057aed16d83f0d96c assets/theurgy/blockstates/caloric_flux_emitter.json
92ebf87f417e3426f30d3e42eeafd933e446eb23 assets/theurgy/blockstates/deepslate_sal_ammoniac_ore.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// 1.20.4 2024-01-22T15:25:03.2820635 Tags for minecraft:item mod id theurgy
7a78325a639e879280cccf4d15f364e02da86003 data/forge/tags/items/gems.json
9a414088a384ea8077655b79eb53ac263aaae5e3 data/forge/tags/items/gems/sal_ammoniac.json
04abd356cb9b230f4d1adcf90db05571e8a17d05 data/forge/tags/items/ores/sal_ammoniac.json
9148832ee4e83df2b37e23918707fd8046f26ff7 data/forge/tags/items/ores_in_ground/deepslate.json
f8295983ffdb0c42c6c8b12788a5b63c1eb43f72 data/forge/tags/items/ores_in_ground/stone.json
e801bdef0719e27dd7decd88269ada7c5740348e data/forge/tags/items/sugar.json
// 1.20.6 2024-05-30T17:11:26.8201974 Tags for minecraft:item mod id theurgy
f41150cbf3906d7eb1284a3f289d93bb80e57b9f data/c/tags/items/gems.json
9a414088a384ea8077655b79eb53ac263aaae5e3 data/c/tags/items/gems/sal_ammoniac.json
04abd356cb9b230f4d1adcf90db05571e8a17d05 data/c/tags/items/ores/sal_ammoniac.json
9148832ee4e83df2b37e23918707fd8046f26ff7 data/c/tags/items/ores_in_ground/deepslate.json
f8295983ffdb0c42c6c8b12788a5b63c1eb43f72 data/c/tags/items/ores_in_ground/stone.json
e801bdef0719e27dd7decd88269ada7c5740348e data/c/tags/items/sugars.json
c1ae367d1f7b1391996652acb8c12cfbe63abfc8 data/theurgy/tags/items/alchemical_mercuries.json
6b2cc4608ef32324e28685c927a71faff559feb3 data/theurgy/tags/items/alchemical_niters.json
07760e14b03fd0089485f8825e5961fedbd2ab80 data/theurgy/tags/items/alchemical_salts.json
d5a5bd4c35eb69220e7e4ec0e991474a2f4442b4 data/theurgy/tags/items/alchemical_sulfurs.json
7e640bba62ec6219c3e3def2845f665fdb1e9cba data/theurgy/tags/items/alchemical_sulfurs.json
34afd6e0275950da142439ac05cd7455f47850e4 data/theurgy/tags/items/alchemical_sulfurs/abundant.json
4356e96ae4efb2a5a21bcc7e7d0ac4e68ae4f0a3 data/theurgy/tags/items/alchemical_sulfurs/common.json
266413752c11313070378f2d5cc88f57a4a87cbd data/theurgy/tags/items/alchemical_sulfurs/gems.json
Expand All @@ -29,19 +29,19 @@ a1f5db5c4c9d4b747e83dd3f796c8698304575bf data/theurgy/tags/items/alchemical_sulf
a60fef1f5fe3c9aab793de4942e301732c51df6a data/theurgy/tags/items/alchemical_sulfurs/precious.json
214fcce95acb2086d5fd0fd4247b8445aaf55efd data/theurgy/tags/items/alchemical_sulfurs/rare.json
3bd13300b62d36e233ff4d34de69f118e502d263 data/theurgy/tags/items/alchemical_sulfurs_and_niters.json
c2e9d4fba333d2af3dbe84b5773c1c1c5e055dc4 data/theurgy/tags/items/gems/mercury/high.json
959c361f3fbee6edb10161ff4ebc2850ef625547 data/theurgy/tags/items/gems/mercury/low.json
e85a6add1492e3a02b8a37a6308fc632e930180f data/theurgy/tags/items/gems/mercury/medium.json
dd248dce97f06027745077215c44f2840b3d6685 data/theurgy/tags/items/metals/mercury/high.json
1ec36d4d19b4be396697dc03365e232bf0e42c97 data/theurgy/tags/items/metals/mercury/low.json
67412e7cf25103161049bc0ac62570357f558191 data/theurgy/tags/items/metals/mercury/medium.json
b119b915f2e2b16c4a5750a50453a2cfddf7235f data/theurgy/tags/items/ores/mercury/high.json
f844cd452a39f1295f45a4cb9585a1510a719986 data/theurgy/tags/items/ores/mercury/low.json
201dcad9991b37cbbe3388aafec4048eebaae020 data/theurgy/tags/items/ores/mercury/medium.json
cddb5c3b26d739614cdd25038f449762a5af9732 data/theurgy/tags/items/other_minerals.json
524efa3a8dcc24905b98159b1337b51391ec167f data/theurgy/tags/items/gems/mercury/high.json
e873104df27d6faa558b42db26e56a3f0b9f8a59 data/theurgy/tags/items/gems/mercury/low.json
d1e03d28eb707840e17f308c160dbf73077b84d1 data/theurgy/tags/items/gems/mercury/medium.json
51382a9c92345c3df994cee528187c92ae466bb5 data/theurgy/tags/items/metals/mercury/high.json
747540d1b7832800b61fdddbd722cdf7e5d73c80 data/theurgy/tags/items/metals/mercury/low.json
68a210ae8b304b7b50b42c6e7dd040dc36122767 data/theurgy/tags/items/metals/mercury/medium.json
474f9b4e1f9a47fc8f192c69d494aa44c391c128 data/theurgy/tags/items/ores/mercury/high.json
7d989993fd00bca9cd8eba6ea927bbdb72e86bb4 data/theurgy/tags/items/ores/mercury/low.json
da1973a5d50ffdfcb88f8727814dbde4af5bca81 data/theurgy/tags/items/ores/mercury/medium.json
c5e13a871dcf746d7fc2c995f5faab375b5c6a73 data/theurgy/tags/items/other_minerals.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/theurgy/tags/items/other_minerals/mercury/high.json
cddb5c3b26d739614cdd25038f449762a5af9732 data/theurgy/tags/items/other_minerals/mercury/low.json
60a5194a30db746b92cf1af2a2eeeca4af7ba1ff data/theurgy/tags/items/other_minerals/mercury/medium.json
ca75039df5ed6330ee575eb55689e8f23a1e7a99 data/theurgy/tags/items/raw_materials/mercury/high.json
ba40677f5ca89c0a487417a60d1bb1fc6e20b837 data/theurgy/tags/items/raw_materials/mercury/low.json
6c46417f3830c1411e097320c5d40fcee9cf28a7 data/theurgy/tags/items/raw_materials/mercury/medium.json
c5e13a871dcf746d7fc2c995f5faab375b5c6a73 data/theurgy/tags/items/other_minerals/mercury/low.json
650fc77d16cbeb336f968ea9bdc195eed6932d45 data/theurgy/tags/items/other_minerals/mercury/medium.json
f6bd9b8ac59118fc0c44c71a5bc8c2ba93089ecc data/theurgy/tags/items/raw_materials/mercury/high.json
dffb7087e34e4e1964d7497a6b9363e6abbc03e4 data/theurgy/tags/items/raw_materials/mercury/low.json
41b5e0086cd263c053383bed48ca5ca700c573d4 data/theurgy/tags/items/raw_materials/mercury/medium.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// 1.20.4 2024-05-11T10:50:26.5485353 Loot Tables
// 1.20.6 2024-05-30T10:41:42.0338676 Loot Tables
72c4014c4a8e846f945380a01c02fc8516e774d7 data/theurgy/loot_tables/blocks/calcination_oven.json
b78ed93c8a746109ac27cbaf07f1d4979078ac50 data/theurgy/loot_tables/blocks/caloric_flux_emitter.json
fd1d6c22b80bf3f1357dd9e23231ce1758e3799f data/theurgy/loot_tables/blocks/deepslate_sal_ammoniac_ore.json
fd7072af99912a91b8804e95b8c8f50f17d36b8c data/theurgy/loot_tables/blocks/caloric_flux_emitter.json
3b0e3258ed5973847301698d335108b1bbadcc0b data/theurgy/loot_tables/blocks/deepslate_sal_ammoniac_ore.json
235af5d0407b90935306c4e7aefbe06a198e92ed data/theurgy/loot_tables/blocks/digestion_vat.json
03da56ccdb1e9f132dc38e079668c8ab7689d708 data/theurgy/loot_tables/blocks/distiller.json
7773b136035a6e945335c00ea9f8e20ca2b06c0d data/theurgy/loot_tables/blocks/fermentation_vat.json
Expand All @@ -13,12 +13,12 @@ affc4e07fa5ea6f2710ba2f12a1ed95ff1f9a400 data/theurgy/loot_tables/blocks/incubat
befb1f76276418639b92a317bc135b73f385ef32 data/theurgy/loot_tables/blocks/logistics_connector_node.json
eab2938a4f87b5111215802411e190728c10cd73 data/theurgy/loot_tables/blocks/logistics_item_extractor.json
1615ae8d2662ddf052afdfdb2a9fa1530d54fd8a data/theurgy/loot_tables/blocks/logistics_item_inserter.json
3a8dda04dd5948b409faf4291422b07de8491cad data/theurgy/loot_tables/blocks/mercury_catalyst.json
9b1613be8445150d38ecd9d54084563e1c8ffbfa data/theurgy/loot_tables/blocks/mercury_catalyst.json
548d06109872a2a9d7f8fbd451414f671be41c36 data/theurgy/loot_tables/blocks/pyromantic_brazier.json
497459c788db5863c058d22ed3873f21eeca8fd6 data/theurgy/loot_tables/blocks/reformation_result_pedestal.json
9225ce24a617011f3c4ab07b42385efc0a15174a data/theurgy/loot_tables/blocks/reformation_source_pedestal.json
b9102f2059d2e55c87ca052896537377c88935a6 data/theurgy/loot_tables/blocks/reformation_target_pedestal.json
1e9e39c1ec35fd04a371c081e9e0dc8e1f246cb1 data/theurgy/loot_tables/blocks/sal_ammoniac_accumulator.json
30f8dbf50bc546bce7c73245555a0393ae17d798 data/theurgy/loot_tables/blocks/sal_ammoniac_ore.json
8e1f9c82b46c7a2d8bbc8d03742df8248e0e2476 data/theurgy/loot_tables/blocks/sal_ammoniac_ore.json
58718450c1d42ff9ef53e693e753fc0c820c79b9 data/theurgy/loot_tables/blocks/sal_ammoniac_tank.json
c1445f3d0519d8cc54945ddcaf95d22b8d6f85e9 data/theurgy/loot_tables/blocks/sulfuric_flux_emitter.json
b187eb118debd94931d24af7145ed83737afbc78 data/theurgy/loot_tables/blocks/sulfuric_flux_emitter.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// 1.20.4 2024-01-16T15:38:38.1662199 Tags for minecraft:fluid mod id theurgy
// 1.20.6 2024-05-30T10:41:42.0348724 Tags for minecraft:fluid mod id theurgy
c5e02d06f56acf2f6153655b74e7d7f22d5750a6 data/theurgy/tags/fluids/sal_ammoniac.json
a36da82105fb95e08c30643937a39170fdde549f data/theurgy/tags/fluids/solvent.json
Loading

0 comments on commit 7998a36

Please sign in to comment.