d86b4816d7
merged from upstream
2026-02-17 22:42:19 +02:00
Pyritie
057ce3103c
quests, remove new netherite tools
2026-02-16 17:52:30 +00:00
Pyritie
5589332726
quest stuff, fix for gt 7.5.2
2026-02-16 17:23:04 +00:00
Pyritie
65d87f1c1c
move some enum strings over to actual enum references to better support turkish
2026-02-16 13:46:27 +00:00
Pyritie
79733b9cfc
added more of create's stone type tags to domum's whitelist
2026-02-15 12:14:26 +00:00
Pyritie
5a6b9bb6eb
Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev
2026-02-10 14:28:08 +00:00
Pyritie
dfd673c369
cleaned up a bunch of regexes
2026-02-10 14:07:06 +00:00
Nebby
a7a01a96b7
High Tier saws can silk harvest ice ( #3019 )
...
* High Tier saws can silk harvest packed ice
* Update changelog
2026-02-10 11:53:48 +00:00
Pyritie
d5e02808f5
surprise! it wasn't removed
2026-02-09 20:07:04 +00:00
Pyritie
891654ac5f
fix kjs after removing that iron tool mixin
2026-02-09 19:02:28 +00:00
Nebby
c8af187dcb
Add Bags for Universal Composts ( #3016 )
...
* Add universal composts
* Update changelog
2026-02-09 18:14:24 +00:00
TomPlop
3a3d502265
Nuclear fix ( #3015 )
...
* fix nuclear line hardlock, move LSA mk2 and change ae2 recipes
* small fix to recipe casing name
* fix ostrum
* Hide items from ExtendedAE
* add quests
* add langfile
* some fix
2026-02-09 18:13:09 +00:00
Pyritie
99e0d3397a
comment this out until gradle is fixed
2026-02-09 16:39:24 +00:00
Pyritie
3c98343897
fix startup crash from tool property
2026-02-09 15:29:45 +00:00
Pyritie
f00b7a76b1
#3007 more decoration more gooder indeed
2026-02-08 13:57:40 +00:00
Pyritie
29047265b7
fix #2988
2026-02-08 12:55:06 +00:00
Pyritie
2efa0180a8
Greate splashing update ( #2995 )
...
* update to greate 0.0.65
* update greate and pakku, add circuits to fan recipes
* that doesn't work
* add ore deposits too
2026-02-07 11:20:59 +00:00
Pyritie
a2662d621c
fixed plutonium ores existing
2026-02-04 22:56:28 +00:00
Pyritie
d0705e84f1
remove plutonium ore
2026-02-04 22:39:20 +00:00
TomPlop
4664715240
fast fix ( #2971 )
2026-02-04 01:28:59 +00:00
Pyritie
d5974bf0c8
more tags
2026-02-03 13:03:27 +00:00
Pyritie
b1ec5ad5b4
#2965 add tfg crop block colors
2026-02-03 13:03:19 +00:00
Pyritie
4516d9ce50
icon set changes
2026-02-03 12:57:42 +00:00
Pyritie
c9b6fbe65f
things endermen can pick up and move around
2026-02-03 12:36:12 +00:00
Pyritie
e7beb2763c
0.11.19
2026-02-03 12:02:46 +00:00
Pyritie
260851074c
Feature/venus stone ores ( #2961 )
...
* langs
* fix veins
* missing knapping textures
* rename ignimbrite features
* new ores
* feature stuff
* entity tweaks
2026-02-02 23:42:42 +00:00
TomPlop
928c7129aa
Heat battery ( #2955 )
...
* heat battery and tooltips
* Add tooltip back
* fix tooltip
2026-02-02 17:32:49 +00:00
Pyritie
3c6b79adc9
fix wrong gurman tags
2026-02-02 15:23:37 +00:00
Pyritie
19bf4de976
gurman update
2026-02-02 14:54:21 +00:00
Redeix
961786b8ee
egh update ( #2950 )
...
* egh update
* changelog and config
* add spore blossom, remove beneath leaves (those are for mars)
Signed-off-by: Pyritie <pyritie@gmail.com>
* Update tags.beneath.js
Signed-off-by: Pyritie <pyritie@gmail.com>
---------
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2026-02-02 12:21:48 +00:00
Pyritie
675c159dfe
fix #2942
2026-02-01 23:29:40 +00:00
Pyritie
a74407c10c
tidy colors and isotopes
2026-02-01 19:02:40 +00:00
Pyritie
e30b293440
fix #2928 , update cl
2026-02-01 17:44:41 +00:00
Pyritie
849f6409d5
Merge branch 'dev' into feature/wab-1.4
2026-02-01 17:37:25 +00:00
Pyritie
365acb1e9e
recipes and fauna data
2026-02-01 17:21:10 +00:00
TomPlop
50eff2f5b9
Fission energy rework ( #2931 )
...
* everything should be fine
* Balance early power (#6 )
* balance update
* Add textures
* last balance tweaks
* more balance
* Fix conflicts
* Balance early power (#8 )
* balance update
* Add textures
* last balance tweaks
* Oupsi
* more fixes
* add changed quests
* push latest balance
* fix tallow
* add btx
* Update quests
* Oups
* Adding some nuclear stuffs so I can merge my branches
* Isotopic solvent stuff (#10 )
* push
* fix iconset issue
* adding all the textures change
* add more stuffs
* Push recipes
* new stuffs
* add stuffs
* more changes
* add textures and some recipes
* tons of change
* fix texture
* add textures and other stuffs
* more recipes
* add recycling for fission rods
* more recipes
* fix fluid textures
* comment out FLiBe again and balance rods
* fix fluids
* some latest fix
* fix more texture
* more recipe changes
* more recipes
* some last minute balance changes
* add quests
* fix conflict
* more fixes
* fix components
* var to const
---------
Co-authored-by: Spicy Noodles <93035068+SpicyNoodle5@users.noreply.github.com>
2026-02-01 10:52:11 -06:00
Pyritie
90535daf1a
add new skulls to mars, update loot tables, add new recipes, hide items
2026-02-01 16:05:14 +00:00
Inceitious
98241ed899
Bugfix/blast property ( #2920 )
...
* Removing blast property
* extractor recipes
* Hid unused molten fluids
* Updated hidden fluids
* Removed molten rocket alloy
* Typo and removed molten desh
2026-01-31 14:43:47 -06:00
Pyritie
34c4bb5fb4
stuff and things
2026-01-31 18:50:46 +00:00
Pyritie
c30ebf249b
add kinetic bridge #2881 , pakku
2026-01-31 15:24:40 +00:00
Madeline Vergani
e32a797368
Noodle and Cereal Box icon sets ( #2875 )
...
* Create a new material icon set `noodle` and give it to vanadium
* Create the `cereal_box` material set for ostrum
* Make Osmium Iodide be a cereal box
* Add a model for radioactive hot ingots
2026-01-27 15:01:05 -06:00
Pyritie
f324e7e6da
New content for ULV + LV ( #2873 )
...
* require black steel plates before the forge hammer, add some blue steel things post-deployer that require a colored steel anvil, start refractory clay dust
* first draft of bakelite, new phenolic boards, new cupro coils
* add another page to the medicine quest
* cl
* backup of lv quests
* quest stuff and some recipe tweaks
* tweak
---------
Co-authored-by: Redeix <redeix.m@gmail.com>
2026-01-26 18:10:22 -06:00
Pyritie
91f41fc8d7
does this fix music?
2026-01-25 18:57:38 +00:00
Pyritie
d89ea91873
make vanadium magnetite meltable #2834
2026-01-24 15:40:33 +00:00
Pyritie
e9e6530a61
fix large miners and deepslate/red granite loot tables
2026-01-24 15:27:11 +00:00
Pyritie
8d17dca5c6
move saltpeter chem reactor to a circuit
2026-01-23 21:12:18 +00:00
Pyritie
53ab136758
add create stock bridge, add missing recipes for certus/fluix deco blocks
2026-01-23 01:43:41 +00:00
Pyritie
65daa7cddb
remove any other stone dust recipes
2026-01-22 20:57:47 +00:00
Pyritie
960d0cc2df
remove tuff dust
2026-01-22 20:37:25 +00:00
Pyritie
1e42ed442a
. ( #2796 )
2026-01-21 22:40:31 +00:00
