Commit graph

2671 commits

Author SHA1 Message Date
Pyritie
58fce401ff
Merge branch 'dev' into dev
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-04-25 17:04:25 +01:00
TomPlop
ba67357214
Universal circuits (#914)
* Adding Universal Circuits

* Fix for Universal Circuits recipes

* Adding Univercal Circuits to their respective files
2025-04-25 17:03:38 +01:00
Pyritie
a419d295c5
added external credits
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-04-25 16:08:13 +01:00
Pyritie
04881b8fc2
Update recipes.js
Signed-off-by: Pyritie <pyritie@gmail.com>
2025-04-25 13:11:55 +01:00
Redeix
ee55e713b1 - Added support for armor trims + new materials
- Added fishing nets
- Added more cloth alternatives
2025-04-25 01:38:06 -05:00
Redeix
506010aeee Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	CHANGELOG.md
2025-04-24 23:54:05 -05:00
Redeix
ffbf585712
Merge branch 'TerraFirmaGreg-Team:dev' into dev 2025-04-24 23:50:15 -05:00
Pyritie
909765e8f3 piglins can have a little explosives, as a treat 2025-04-24 23:48:38 +01:00
Pyritie
2908bab19e fixed visual workbench crash 2025-04-24 23:44:06 +01:00
Pyritie
04ce564c92 fixed aoe tools in bastion chests not having their aoes properly 2025-04-24 23:33:27 +01:00
Pyritie
2cc2516d25 added an early way to get gregtech medicine, and added some more plants for medicines 2025-04-24 23:33:12 +01:00
Pyritie
52aa6e91a1 another greate workaround... 2025-04-24 22:37:39 +01:00
Pyritie
c765e00e5b fixed some warnings 2025-04-24 22:37:30 +01:00
Pyritie
4a75d000d7 buffed how much string you get from cobwebs, made tfc shears work for silk touching it 2025-04-24 22:36:52 +01:00
Pyritie
d37f1baa20 why does the mortar recipe use a centrifuge? changed to a mixer 2025-04-24 22:11:04 +01:00
Pyritie
8b9f0d693c added some more glue recipes 2025-04-24 22:10:48 +01:00
Pyritie
2be25e16f4 fixed the create cut stone consuming your chisel 2025-04-24 22:03:56 +01:00
Pyritie
f44552e59e langs 2025-04-24 21:40:03 +01:00
Pyritie
655e2685f2 added gt lathe recipe to make a tfc lens 2025-04-24 21:35:24 +01:00
Pyritie
756f27861b changed bricks and flagstones to use a cutter instead of an assembler 2025-04-24 21:35:13 +01:00
Pyritie
f7a242462c basic belts now only accept rubber, but all belts are now half price! 2025-04-24 21:20:38 +01:00
Pyritie
ae03865762 removed create connected's hand cogwheels because they were another greate exploit, added recipes for its windows, enabled its copycat blocks 2025-04-24 21:17:59 +01:00
Pyritie
1a4ac7e0ca removed VI laser engraver 2025-04-24 20:57:22 +01:00
Pyritie
3828ce5de7 fixed being able to macerate basic belts from leather into rubber 2025-04-23 23:52:23 +01:00
Pyritie
41044519cb once again I am changing the rotation speed controller recipe 2025-04-23 23:46:39 +01:00
Pyritie
fb2a2dd864 swapped panes to need any glass block and not the clear one 2025-04-23 23:33:12 +01:00
Pyritie
8144afaad8 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-04-23 23:18:45 +01:00
Pyritie
8cc17b5fb0 update changelog 2025-04-23 23:18:42 +01:00
Pyritie
f4bfbdd3cc update todos 2025-04-23 23:17:55 +01:00
Pyritie
80822c4816 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-04-23 23:13:33 +01:00
Pyritie
f48052afd6 missed a rod 2025-04-23 23:10:35 +01:00
Pyritie
6025d81c23 hid mv+ solar panels 2025-04-23 23:10:28 +01:00
Pyritie
40e8c9c545 fixed glass dust recipes 2025-04-23 23:10:17 +01:00
Pyritie
b2e3097cc4 fixed recipes for glass panes, hid most of create:connected for crimes against greate 2025-04-23 23:10:07 +01:00
Pyritie
fb47aa38f1 added second recipe for drink upgrade 2025-04-23 22:59:32 +01:00
Pyritie
4334b9c465 glass recipe fixes 2025-04-23 22:20:00 +01:00
Pyritie
7d2f188dff properly fixed the bronze millstone this time 2025-04-23 22:19:07 +01:00
Pyritie
058a3ae103 added recipe for vanilla campfire, for people who like smoke particles (me) 2025-04-23 22:15:57 +01:00
Pyritie
87dc55582d removed adjustable chain gearshift because you could get around greate with it 2025-04-23 22:15:23 +01:00
Pyritie
4b60d9b888 implemented visual workbench for tfc workbenches 2025-04-23 22:14:22 +01:00
Pyritie
9e1e67b2cd bumped up how fast your tongs get hot 2025-04-23 22:14:10 +01:00
Pyritie
1ca74a8769 hot or not fixes! goodbye, blowpipe exploit 2025-04-23 22:13:25 +01:00
Pyritie
b17f61ffa3 rebalanced alternators and steam engines 2025-04-23 21:42:01 +01:00
Pyritie
9558604a72 buffed tong durability, hopefully also fixes the oven thing too 2025-04-23 21:41:50 +01:00
Pyritie
032773d491 added some configs 2025-04-23 21:41:36 +01:00
TomPlop
03fa741db6
Quests rework and small fixes (#911)
* First modification of MV Quest structure
test

* Starting some changes for quest_rework

* Fixes for scaffolding frame and bloomery steam consumption so it works with only one High pressure liquid boiler

* Big changes for quests including Ore Processing Chapter, MV Chapter without the lang file and some fixes around the quest book. Also include a fix for Steam Bloomery so it only needs 1 High Pressure Liquid Boiler to run as max parallel and the fix for scaffolding frame

* Update my branch with recent changes

* Fix for Ice to Packed Ice
2025-04-23 17:34:31 +01:00
Pyritie
87b3937768 cast iron tools are (mostly) gone! 2025-04-23 01:08:57 +01:00
Pyritie
0ac8108f50 fixed iron dust in the steam bloomery 2025-04-23 00:33:35 +01:00
Pyritie
5db88cda00 fixed mechanical bearing 2025-04-23 00:23:29 +01:00
Pyritie
17bd5a9a0a oops this was halved 2025-04-22 20:24:14 +01:00