Skip to content

Commit 4199621

Browse files
authored
[1.20.1] Added the rest of JEI compat (#2)
* started work on jei compat * added clickable area for producers (dna wip) * finished producers * fixed recipe path typo * finished dna labware display, moving to processing machines * added recipe catalysts * forgot to run data generators * cleaned up some code, made it less congested * moved producers code under same path
1 parent 32b4b7d commit 4199621

22 files changed

+269
-18
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.20.1 2025-01-14T18:00:20.7166039 ModKit Language: en_us for mod 'gendustry'
2-
a67e95b70c92f62f4d94c6831fced1974ff2d8ae assets/gendustry/lang/en_us.json
1+
// 1.20.1 2025-01-20T18:49:21.4418297 ModKit Language: en_us for mod 'gendustry'
2+
dc3ec84cadb2f83e7e36bcc5e6e5d5be1c1ef5cb assets/gendustry/lang/en_us.json

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2025-01-14T23:05:00.7044002 Recipes
1+
// 1.20.1 2025-01-20T19:27:35.7743009 Recipes
22
f6e776b964531a01c7ba87ab89c7705969105cc3 data/gendustry/advancements/recipes/misc/activity_simulator_elite_upgrade.json
33
d10b8cb8f7e9927b0057ca12bb22cf6c25abfefa data/gendustry/advancements/recipes/misc/advanced_mutatron.json
44
611d8e0b68aa9b0a58559a0dfb5ceb13fd9298eb data/gendustry/advancements/recipes/misc/automation_upgrade.json
@@ -52,6 +52,16 @@ d6ea5ac2ddf764d1b7218e1fc11da0ead2b274aa data/gendustry/recipes/blank_gene_sampl
5252
a4d95241e639906aab9c5c737863560401480a0b data/gendustry/recipes/climate_control_module.json
5353
f687cc074d768e789b2d43e62fc906be97c58347 data/gendustry/recipes/combine_genetic_template.json
5454
45a06cae1f7bab07a93086cc00a694a17a00d880 data/gendustry/recipes/cooler_upgrade.json
55+
229f6a1cd1e8c23694c5108459f5de194efd5906 data/gendustry/recipes/dna/butterfly.json
56+
4292d9a2976565315a4255be1f660435fa449d5a data/gendustry/recipes/dna/caterpillar.json
57+
59c53139f3f24805e5001dd08925e8b6ecb02e27 data/gendustry/recipes/dna/cocoon.json
58+
2c76f025619f28d4158560435440eed4e2097512 data/gendustry/recipes/dna/drone.json
59+
222536094cf0c80e647641c30315ad6dff23749a data/gendustry/recipes/dna/larvae.json
60+
4bc638cda6099f6b9e4ce46b024e4485f3e921bf data/gendustry/recipes/dna/pollen.json
61+
01228d2c8433f025a6e867f67aebce5e49294af7 data/gendustry/recipes/dna/princess.json
62+
054f9162f068c570e76337f041013d8ba9e4b4b1 data/gendustry/recipes/dna/queen.json
63+
aeeea2c652f238e7603f6d5c6fe094ba17569d0b data/gendustry/recipes/dna/sapling.json
64+
660c786e588fe8c87c21bdd2e1394fbea83a3559 data/gendustry/recipes/dna/serum.json
5565
5c12ca057c9bd513560789eb97bda2bf29ab49c9 data/gendustry/recipes/dna_extractor.json
5666
67d8b0786245d71d7b72a3cd71b55e5a07d44966 data/gendustry/recipes/dryer_upgrade.json
5767
297c2d8e805ec336444ebd9ec5c419f19eaf4f50 data/gendustry/recipes/elite_upgrade_frame.json
@@ -80,21 +90,11 @@ fe09292eda4663ede6a06a734a3058c72bc5a2d9 data/gendustry/recipes/mutatron.json
8090
f92c2071f551fb9b13c087a77707c01cc5025fad data/gendustry/recipes/productivity_elite_upgrade.json
8191
637315de889058b0d5fa24c9813ca63053f6cf6a data/gendustry/recipes/productivity_upgrade.json
8292
d085832ee27decbc77ba94611341566f7b9193c0 data/gendustry/recipes/protein/beef.json
83-
229f6a1cd1e8c23694c5108459f5de194efd5906 data/gendustry/recipes/protein/butterfly.json
84-
4292d9a2976565315a4255be1f660435fa449d5a data/gendustry/recipes/protein/caterpillar.json
85-
59c53139f3f24805e5001dd08925e8b6ecb02e27 data/gendustry/recipes/protein/cocoon.json
8693
252530d1cf7f4567122c422fa1b8f918db6cb0ec data/gendustry/recipes/protein/cod.json
87-
2c76f025619f28d4158560435440eed4e2097512 data/gendustry/recipes/protein/drone.json
88-
222536094cf0c80e647641c30315ad6dff23749a data/gendustry/recipes/protein/larvae.json
89-
4bc638cda6099f6b9e4ce46b024e4485f3e921bf data/gendustry/recipes/protein/pollen.json
9094
3252b0df877b4e0883ba4397aaaf5fb89fcb7fad data/gendustry/recipes/protein/porkchop.json
91-
01228d2c8433f025a6e867f67aebce5e49294af7 data/gendustry/recipes/protein/princess.json
9295
ca53c63c78b08871076323f9a0c7ff420bec8990 data/gendustry/recipes/protein/pufferfish.json
93-
054f9162f068c570e76337f041013d8ba9e4b4b1 data/gendustry/recipes/protein/queen.json
9496
553091dd7e400e6a1e40e6fa23aca2442041c2a0 data/gendustry/recipes/protein/rabbit.json
9597
e623827b959a2409af87b8c921f6de8cd73b1d9e data/gendustry/recipes/protein/salmon.json
96-
aeeea2c652f238e7603f6d5c6fe094ba17569d0b data/gendustry/recipes/protein/sapling.json
97-
660c786e588fe8c87c21bdd2e1394fbea83a3559 data/gendustry/recipes/protein/serum.json
9898
63000ab315360768fe18aa0a2bbd204cf7c81877 data/gendustry/recipes/protein/tropical_fish.json
9999
a2c7e6c66243a7287b9aa16e01b1802314f8ec80 data/gendustry/recipes/protein_liquefier.json
100100
82f1540f27dcebb8b282a0c78865a9414e276f78 data/gendustry/recipes/receptacle.json

src/generated/resources/assets/gendustry/lang/en_us.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
"for.hints.sample_usage.tag": "What are samples for?",
7272
"for.hints.transposer_usage.desc": "The Genetic Transposer creates copies of Gene Samples and Genetic Templates.",
7373
"for.hints.transposer_usage.tag": "How to use the Genetic Transposer?",
74+
"gen.for.chance": "%s%% chance to be consumed!",
7475
"item.gendustry.activity_simulator_elite_upgrade": "Activity Simulator Elite Upgrade",
7576
"item.gendustry.activity_simulator_elite_upgrade.tooltip": "A combination of the Sky, Weatherproof, and Lighting upgrades.",
7677
"item.gendustry.automation_upgrade": "Automation Upgrade",

0 commit comments

Comments
 (0)