Commit Graph

118 Commits

Author SHA1 Message Date
DrMangoTea
5d31947f7d code optimization & distillation fix 2025-07-26 22:35:12 +02:00
PouffyDev
edce5d7e0e Merge remote-tracking branch 'origin/1.21.1' into 1.21.1 2025-07-26 16:34:06 +01:00
PouffyDev
a83c0ef74b Winding Machine fix 2025-07-26 16:33:46 +01:00
DrMangoTea
f910904992 electricity optimization 2025-07-26 10:09:01 +02:00
DrMangoTea
e5107adaf2 Merge remote-tracking branch 'origin/1.21.1' into 1.21.1 2025-07-26 08:40:32 +02:00
DrMangoTea
4bac7b4812 pipes fixes 2025-07-26 08:40:22 +02:00
PouffyDev
d47ea56c28 Better Pipe Registry
- Also change the brass palette to match other Brass components.
- Encased Pipes now have connected textures.
- Improved pipe registry with TFMGPipeEntry.
- Coke Ovens now output still fluids.
2025-07-25 19:44:10 +01:00
PouffyDev
b5daa2c12b Pix possible null value in ElectriciansWrenchItem 2025-07-24 22:19:16 +01:00
DrMangoTea
a6ed629789 Merge pull request #205 from Kaloyan501/1.21.1
Add gluing step to Pumpjack note
2025-07-23 23:12:29 +02:00
Kaloyan501
54f7ad4036 Add gluing step to Pumpjack note 2025-07-17 01:15:52 +03:00
PouffyDev
97d8b42e31 Port some more of my 1.20 commits 2025-07-15 22:14:24 +01:00
PouffyDev
69bbb9ec75 Registries for Electrodes & Cable Types
- Port my registry commit to 1.21.1!
- Added registries for Electrodes and Cable Types.
- Winding Machines now tint the main spool instead of requiring partial models for each spool.
- Electrode Holders now render the item model of the electrode instead of requiring partial models for each electrode.
- Added Resistivity config for Cable Types.
- Updated classes to handle the new registries instead of enums.
- Moved the ChemicalVatCategory's recipe sprite to a separate method so mixins can target the sprites specifically.
2025-07-15 21:17:29 +01:00
PouffyDev
d232842574 gitignore 2025-07-15 17:57:18 +01:00
PouffyDev
01c2586ad7 Revert "gitignore"
This reverts commit 70f35effae.
2025-07-15 17:55:47 +01:00
PouffyDev
fae00345a6 Merge remote-tracking branch 'origin/1.21.1' into 1.21.1
# Conflicts:
#	.gitignore
2025-07-15 17:53:59 +01:00
PouffyDev
70f35effae gitignore 2025-07-15 17:53:17 +01:00
PouffyDev
6b08bbfe75 Create .gitignore 2025-07-15 17:49:52 +01:00
DrMangoTea
d9a56c3dbd Delete .gradle/8.10 directory 2025-07-15 00:35:36 +02:00
DrMangoTea
150f4729ff Delete build directory 2025-07-15 00:35:28 +02:00
DrMangoTea
5d66225ed7 first 1.21.1 commit 2025-07-15 00:32:31 +02:00
DrMangoTea
aab37b9345 first 1.21.1 commit 2025-07-15 00:28:15 +02:00
DrMangoTea
9a7d8f8739 Delete src/main/java/com/drmangotea/tfmg/a 2025-06-26 00:30:54 +02:00
DrMangoTea
111c357c92 Create a 2025-06-26 00:30:44 +02:00
DrMangoTea
a09ac1652d Add files via upload 2025-06-26 00:29:21 +02:00
DrMangoTea
661364f66d Add files via upload 2025-06-26 00:29:00 +02:00
DrMangoTea
93361f0cef Delete settings.gradle 2025-06-26 00:28:15 +02:00
DrMangoTea
a969624f73 Delete gradlew.bat 2025-06-26 00:28:08 +02:00
DrMangoTea
e38d0a1878 Delete gradlew 2025-06-26 00:28:03 +02:00
DrMangoTea
85106f9203 Delete gradle.properties 2025-06-26 00:27:56 +02:00
DrMangoTea
1878ba5a2a Delete build.gradle 2025-06-26 00:27:51 +02:00
DrMangoTea
8bc675e4a4 Delete LICENSE 2025-06-26 00:27:45 +02:00
DrMangoTea
db683a90e5 Delete .gitignore 2025-06-26 00:27:39 +02:00
DrMangoTea
51f9ab3dd2 Delete tfmg_engine_fuels directory 2025-06-26 00:27:31 +02:00
DrMangoTea
684694051a Delete gradle/wrapper directory 2025-06-26 00:27:20 +02:00
DrMangoTea
f817bb4439 Delete src directory 2025-06-26 00:25:24 +02:00
DrMangoTea
c841e3566e Delete .vscode directory 2025-06-26 00:18:59 +02:00
DrMangoTea
0111ead3dc Delete .idea directory 2025-06-26 00:18:49 +02:00
DrMangoTea
6dea149f08 Delete changelog.txt 2025-06-26 00:18:22 +02:00
DrMangoTea
63c3c4a204 Delete run-data/logs directory 2025-06-26 00:00:36 +02:00
DrMangoTea
f65d4b3d90 Delete run directory 2025-06-26 00:00:25 +02:00
DrMangoTea
8dd2a88fc1 1.0 2025-06-25 23:48:03 +02:00
DrMangoTea
de22cf8dd6 tooltips 2025-06-16 18:21:52 +02:00
DrMangoTea
68b21429f1 fixes 2 2025-06-02 19:59:00 +02:00
DrMangoTea
6bdf086df0 Merge remote-tracking branch 'origin/master' 2025-06-02 17:51:13 +02:00
DrMangoTea
e2abb9b7f5 fixes 2025-06-02 17:51:00 +02:00
pepagg
f351d8c931 Update MiscTFMGScenes.java
Fixed up grammar on ponders
2025-05-25 22:03:08 +02:00
Pepa
844068a018 Changed chemical vat texture and added Heating visualisation 2025-05-25 20:38:01 +02:00
DrMangoTea
8b566a64f5 some fixes 2025-05-25 16:46:22 +02:00
DrMangoTea
fe9986f06b eeeeeeeeee 2025-05-21 22:10:54 +02:00
DrMangoTea
be710fa76b more stuff 2025-05-12 20:55:57 +02:00