Commit graph

174 commits

Author SHA1 Message Date
Risuga
1d89d6f5d9
Normalize ladders as fuel (#2043)
* double ladders from sticks

Signed-off-by: Risuga <oosyrag@gmail.com>

* half ladders from lumber

Signed-off-by: Risuga <oosyrag@gmail.com>

* 1/3 ladder burn time 

Signed-off-by: Risuga <oosyrag@gmail.com>

* wood frame burn time

Signed-off-by: Risuga <oosyrag@gmail.com>

* remove ladders and wood frames as boiler fuel

Signed-off-by: Risuga <oosyrag@gmail.com>

* Update CHANGELOG.md

Signed-off-by: Risuga <oosyrag@gmail.com>

---------

Signed-off-by: Risuga <oosyrag@gmail.com>
2025-10-16 22:59:41 +01:00
Pyritie
153ae76522
Feature/mars piles and layers (#1975)
* changes for some sand layer/pile stuff

* Martian wind (#1883)

* add texture for wind

* add multiple martian wind types

* fix semiheavy concurrent with tfg core

* rename wind to match convention

* fix blockstate registration error

* why is this even turned on by default

* translate code regions + placeholder bundle recipe

* add mars climate controller

* add debug stick functions

* cleanup

* add layer block models

* add jsons

* cleanup

---------

Signed-off-by: Zippity <i.wa.anderson.86@gmail.com>

* refactor

* undo bundle

* added a bunch of missing snow pile tags

* item model changes

* more snow piled tags

* add dust storm severity biome tags

* some cleanup

---------

Signed-off-by: Zippity <i.wa.anderson.86@gmail.com>
Co-authored-by: Zippity <i.wa.anderson.86@gmail.com>
2025-10-07 18:22:41 +01:00
Jason Nash
e51cf2f07b
all pressure plates to circ 3 (#1970) 2025-10-06 22:30:33 +01:00
Pyritie
468d1d0e01 added mars trees to the tree chop mod
loot tables for mars "leaves", recipes for plant balls/biomass
2025-10-04 23:59:19 +01:00
Pyritie
c079ce8cca changed mixer glowstone recipe to circuit 8 2025-10-04 16:30:49 +01:00
Pyritie
d68c0550f9 various crop related things 2025-10-03 01:20:03 +01:00
Pyritie
54d97bf632 fixed lantern not being breakable 2025-10-01 20:32:04 +01:00
Pyritie
16ae9167a8
mars snow (#1931)
* bare bones

* snow piled tag

* added climate restriction to quicksand, added powder snow up north

* better tagging

* langs

* assets

* missed feature in deep desert

* remove waves from mars

* climate tweaks

* icicles and dry ice stuff

* langs
2025-09-30 18:15:35 +01:00
Adrien Vidal
c856ec9398
[Molden] Stone TFGfication p3 - Aqueducts, Supports + Cutting and Grinding fixes (#1919)
* Aqueducts + move stone characs to constants

* Supports

Supports for all stones
Remapped to the original textures rather than copies (all removed)

* Support tooltips

+ recipe rocks regions added

* Macerator Recipes

- Add Macerator missing grinding recipes
- Change the TFC stone Macerator recipes to the same ratios

* aqueduct recipes + stonecutting fixes

* Remove redundant tags

---------

Signed-off-by: Adrien Vidal <vidal.adrien2@gmail.com>
2025-09-28 12:10:33 -05:00
Pyritie
a59038c911 no more blaze 2025-09-28 00:31:19 +01:00
Pyritie
dd566d3820 goodbye, terrariums, you will be missed 2025-09-28 00:12:32 +01:00
Pyritie
b7e02e74f4 made vanilla campfire craft a bit less weird 2025-09-27 18:01:22 +01:00
Pyritie
030db1280c I think this should show all the commented out mars content? 2025-09-26 23:37:23 +01:00
Pyritie
e9569277d9 smelt magma cream to glue 2025-09-22 23:49:56 +01:00
GameStar
b06e59db31
Feature/new emi categories (#1862)
* stuff

* all the stuff

* Update CHANGELOG.md

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-09-20 11:51:56 +01:00
Jason Nash
82b37d3903
enable minecart_furnace + 2 recipes to make it (#1860) 2025-09-19 15:38:55 -05:00
Jason Nash
6b8f1446e1
remove 2 tags from moss carpets (#1849) 2025-09-17 16:51:01 +01:00
Adrien Vidal
0a8e68e7d0
[Molden] Stone TFG-fication continued (#1845)
* Fixed some rock type tags

* Nether mossy cobbles

* nether mossy bricks

* mossy bricks

* nether brick recipes + deepstate sets + typos

* cobble interaction index

* reformatting tables

* Region delimiters for stone blocks

* More shaped sets + deepslate recipes

+ missing landslide recipes
+ tables formatting for readability

* Other nether shaped blocks

+ A bit or reorganizing of recipes.rocks.js

* Many Space Stone Blocks

+ Stone Declaration Refactor
+ Many typo fixes
+ Moon Stone Recipes
+ Some Missing tags

* Tags Refactor + Missing Blocks

* definition fix

* remove console debugs

* Space stones cutting & Interractions

+ Breaker Duping Reformat
+ Missing Dripstone Brick
+ Missing Red Granite recipes
+ Misc bugfixes

* small fix

* Vanilla Stone + Red Sandstone Fix

+ Duper loop fix

* Undo .gitignore changes

* Venus sandstone stuff
2025-09-16 15:54:54 -05:00
Pyritie
91cd35e91a added recipe for bone meal to white dye #1757 2025-09-08 16:08:48 +01:00
GameStar
020d4f9018
Flax (#1735)
* some flax stuff

* linen stuff

* flax line stuff

* flax again

* rapseed wild crop changes

* flax worldgen

* revert grooming station update

* more flax stuff

* trying to fix stuff

one doesn't work

* recipes and lang

* Update CHANGELOG.md

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* fixes

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-08-31 19:14:14 +01:00
Pyritie
ca8ac9d727 added some more vanilla blocks to the forge/bloomery insulation tag #1673 2025-08-23 12:37:53 +01:00
Pyritie
df9e90efa6 fix brick recipe conflict 2025-08-23 12:26:39 +01:00
Pyritie
3329a49049 missing hematitic sand tag 2025-08-22 22:40:54 +01:00
Pyritie
46b6a2da60 gregtech papyrus tweaks 2025-08-22 21:27:18 +01:00
Pyritie
365fe1e5ca moved golden apples to the food processor 2025-08-13 23:08:01 +01:00
Pyritie
6bba775be0 mushroom and bamboo EGH recipes, also changed them all to the appropriate kind of water 2025-08-13 22:51:43 +01:00
Pyritie
af5e279954 moon rabbits can eat chorus fruit now 2025-08-13 22:31:18 +01:00
Pyritie
0e2114fea7 fixs #1506 2025-08-02 14:22:23 +01:00
Pyritie
3f97561bd8 added a few entities to mars for fun 2025-07-29 02:13:55 +01:00
Pyritie
e83833bcf5 changed all fluid tags to the new format 2025-07-28 15:46:18 +01:00
Pyritie
cfbd82e595 moon wood stuff 2025-07-28 15:20:25 +01:00
Gustavo
f3dfa471ec
Refactor & update to gt7
* gt7 removed credits/coins

* port gregtech additions to java

* add eslint locally

* add style linting

* switch target ECMA standard

* run linter

* clean up a bunch of linter errors

* remove outdated greate API calls

* forgot about the TFC multi compat issue

* reverted greate recipe removals

* some more linting stuff

* fix some issues with greenhouse recipes

* fix up some material stuff

* fix recipe types

* - Fixed single block machine rendering (#1465)

* minor fixes and changes

---------

Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-07-28 12:27:06 +10:00
Pyritie
d451d49800 added recipes for middle tier compost in mixer, added compostable tag to vanilla moss 2025-07-26 12:48:43 +01:00
Pyritie
ec46eb3832 fixes #1423 2025-07-23 21:13:58 +01:00
Pyritie
3d2ed09f9b added create sandpaper recipes for early game gems, unified observer recipes 2025-07-23 21:10:59 +01:00
Gustavo
3d89d59d4d use strict 2025-07-21 13:52:18 +10:00
Pyritie
0523ff9a02 fix mushroom conflicting recipes 2025-07-19 19:43:09 +01:00
GameStar
0a32609a4b
Feature: Tier 2 insulation (#1349)
* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* models

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* textures

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* ad as

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update tags.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.removes.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.removes.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.miscellaneous.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update items.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update materials.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update recipes.miscellaneous.js

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Add files via upload

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update CHANGELOG.md

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-07-16 12:05:10 +01:00
Pyritie
64244314e0
Updated Primitive Creatures (#1337)
* updated primitive creatures, and figured out how to make them not spawn randomly any more

* tags and items and recipes

* tweak

* langs

* adding loot

* mod ID rename

* langs

* more loot tweaks

* loot tweaks
2025-07-15 11:48:00 +01:00
Redeix
28d87caae3
Harvest baskets + (#1338)
* - Yeast recipe conflict fix

* - Fixed seed oil voiding in barrels. And item weight inconsistency.

* - Reduced loading screen logo size by 4MB

* - Update Changelog

* - Compressed loading screen images to maybe help with ram

* - Added default gui scale to make the main menu look better on first launch

* - Update Changelog

* - Added utility script for adding circuits to existing recipes

* fixed changelog conflict

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added harvest baskets

* - Fixed baked potato recipe mixing from oven

* - Allowed elytras to be repaired regardless of damage

* - Fixed sea water barrel recipe

* - Gave plants tags to bushes so they can have other uses

* - Pushed stubborn models

* - updated Changelog

* - Changelog typo

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
2025-07-15 03:37:45 +01:00
Pyritie
30f50f2e97
Merging guns branch (#1283)
* Feature/ulv ev guns (#1280)

* update pakku mods

* mod config stuff

* Port over of current guns

* ae2 gun recipes

* nitrocellulose and other stuff

* more recipes

* gun packs

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* Update pakku-lock.json

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>

* LICENSE

* changed powderbarrel to use lumber instead of wood boards

* lang

* gunpowder unification

* emi categories

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-07-13 12:31:39 +01:00
Pyritie
3dffb8e93e remove ender eye, added vitrified ender pearl 2025-07-09 00:49:02 +01:00
Pyritie
3a255f5e70 oops, greate's update meant all our macerator removals stopped working 2025-07-06 22:48:42 +01:00
Pyritie
0848393225 cleanup of #1248
Related Work Items: #12
2025-07-05 13:12:08 +01:00
34y34y34y34y34y34y34y34y34y
460b5db80e
Crop stuff for biodiesel, works on my machine . (#1248)
* Added the crop stuff I made so far

* I think thiss should be fine?

* I litteraly have no idea what I am doing

* I hope this fixes everything

---------

Signed-off-by: 34y34y34y34y34y34y34y34y34y <34y34y34y34y34y34y34y34y34y@gmail.com>
2025-07-05 12:15:00 +01:00
Pyritie
6bf2ad74cd
Mechanical press (#1243)
* welcome back, mechanical press

* EMI category order

* langs

* quests

* emi categories

* quests

* greate stress settings for the mech press

* I got distracted so I guess these are on this branch now

* removed welding recipes from the pressurizer

* recipe additions and changes for the mech press!

* let's go gambling!

* added flux to the mech press "welding" recipes
2025-07-05 01:41:03 +01:00
Pyritie
5fd8d896eb replaced all our water input fluids with a tag, so river water works too 2025-06-30 19:14:31 +01:00
Pyritie
9f439a60ed added rock duping recipes for vanilla basalt, added greenhouse recipe for spore blossom 2025-06-25 22:10:33 +01:00
Pyritie
072263a981 added, changed, removed recipes and things for create + its addons 2025-06-24 16:56:55 +01:00
Pyritie
006a1c8da9 redo e35c340 2025-06-24 15:03:00 +01:00