Commit Graph

  • e35c34040d Migmatite conflict fix (#1153) Jean Roberto de Souza 2025-06-16 13:03:14 -03:00
  • 712f8a33c7 fixes #1162 Pyritie 2025-06-16 16:54:28 +01:00
  • 6a6f72829a removed gems tag from flint Pyritie 2025-06-16 16:50:01 +01:00
  • 5b0e9bda98 fixes #1165 Pyritie 2025-06-16 16:47:43 +01:00
  • 692cd26780 - Food changes (#1167) Redeix 2025-06-16 04:57:17 -05:00
  • 3f46b6856f - Updated texture for aqueous accumulator (#1168) Redeix 2025-06-16 04:56:15 -05:00
  • 3148d3ad66 Update README.md Pyritie 2025-06-16 10:54:54 +01:00
  • e60109bdc9 - Updated texture for aqueous accumulator Redeix 2025-06-16 01:05:29 -05:00
  • 787a1afe44 - Food changes Redeix 2025-06-16 00:33:37 -05:00
  • 65f987dd4b Add some more food recipes (#1166) ofoxsmith 2025-06-16 06:03:16 +10:00
  • 1bfb5a969b Merge pull request #1156 from TerraFirmaGreg-Team/dev 0.9.11 Xikaro 2025-06-13 22:14:21 +05:00
  • a6a5810b7e bump Xikaro 2025-06-13 22:11:48 +05:00
  • c8203a17ce Update pakku-lock.json Xikaro 2025-06-13 22:09:57 +05:00
  • 77d981c5fa Update pakku-lock.json for lunchbox fix (#1164) Redeix 2025-06-13 11:43:34 -05:00
  • 35f950eb79 started work on rewriting the readme Pyritie 2025-06-13 13:06:56 +01:00
  • ffc2106945 recipe fixes Pyritie 2025-06-13 00:39:27 +01:00
  • 86a141881d wrong food lang Pyritie 2025-06-12 23:10:56 +01:00
  • 2b2deb72fe tooltip fix Pyritie 2025-06-12 22:48:39 +01:00
  • 36bc3c699c langs Pyritie 2025-06-12 22:39:25 +01:00
  • 284de79e8c comment out coconut milk Pyritie 2025-06-12 21:53:25 +01:00
  • a6402c63af update greenhouse tooltip Pyritie 2025-06-12 21:53:15 +01:00
  • 8b18a4c7a6 update greenhouse quest Pyritie 2025-06-12 21:52:37 +01:00
  • db1907f1a5 pakku updates Pyritie 2025-06-12 20:38:22 +01:00
  • c6e090fe50 Merge branch 'dev' into feature/create-6 Pyritie 2025-06-12 13:34:02 +01:00
  • b7cc04f188 merge Pyritie 2025-06-12 13:33:44 +01:00
  • f822289573 custom gregtech machines and logic to handle TFC recipes (#1160) ofoxsmith 2025-06-12 22:32:10 +10:00
  • c83dae8b7d Merge branch 'dev' into feature/food Pyritie 2025-06-12 13:27:17 +01:00
  • d7d590ee7b lunchbox capsule recipe tweaks Pyritie 2025-06-12 10:11:58 +01:00
  • d12d2001c3 Update lunch box recipe (#1159) Redeix 2025-06-12 02:27:08 -05:00
  • 3dd247ab7e pakku updates Pyritie 2025-06-11 20:58:52 +01:00
  • cc26bf9fca latex balance changes Pyritie 2025-06-11 20:30:22 +01:00
  • 09a9891a8a changelog Pyritie 2025-06-11 20:20:21 +01:00
  • 2b0b31d5b5 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Pyritie 2025-06-11 20:18:36 +01:00
  • ff49260d5f added cinnabar to the piglin barter table Pyritie 2025-06-11 20:18:34 +01:00
  • a03ea2a556 hi hecuba Pyritie 2025-06-11 19:43:20 +01:00
  • c816ac4caf Merge branch 'main' into dev Xikaro 2025-06-11 16:37:32 +05:00
  • 390bdc3cba Update pakku-lock (#1157) Redeix 2025-06-11 01:30:43 -05:00
  • e037e0fcc8 Update build.yml (#1155) Redeix 2025-06-11 00:12:45 -05:00
  • 24da0baeb6 fixed steel millstone not actually needing steel, fixed its recycling recipe Pyritie 2025-06-10 21:21:30 +01:00
  • 33088aa174 rearranged food recipes into hopefully a good format? Pyritie 2025-06-10 20:13:03 +01:00
  • 6e9f2401ac lunchbox adjustments Pyritie 2025-06-10 17:09:00 +01:00
  • 601e92427b more lunchbox stuff Pyritie 2025-06-10 17:06:59 +01:00
  • 4d492e261d added lunchbox quest Pyritie 2025-06-10 17:06:45 +01:00
  • c91f8efe0e changed LV optional quests to correctly have the heart icon Pyritie 2025-06-10 17:06:14 +01:00
  • 01ce7e19fb moved backpack size data to its own file, added lunchbox size data Pyritie 2025-06-10 16:58:06 +01:00
  • e1aec5977c fixes warnings about metal bars in the cutter Pyritie 2025-06-10 16:36:03 +01:00
  • f53fb9b51b added tfc-lunchbox to pakku too Pyritie 2025-06-10 16:33:07 +01:00
  • a845d76657 added recipes for tfc-lunchbox! Pyritie 2025-06-10 16:32:43 +01:00
  • 75a6d3d875 fixed colored steel from having higher tier blast furnace recipes, now they can all just use the basic one too Pyritie 2025-06-10 16:32:32 +01:00
  • 09641378a3 fixed using the wrong battery in the ultimate battery recipe Pyritie 2025-06-10 11:38:55 +01:00
  • a17784d63b Update CHANGELOG.md Redeix 2025-06-09 22:57:43 -05:00
  • d44f713041 lang Pyritie 2025-06-10 02:17:16 +01:00
  • 32268b9d31 Merge branch 'dev' into feature/space Pyritie 2025-06-10 02:16:10 +01:00
  • 31d21075e3 antigravity! and zip gun tags Pyritie 2025-06-10 02:13:48 +01:00
  • b93ff500d0 whatever this is Pyritie 2025-06-10 02:13:38 +01:00
  • 5b462bbb28 compressed airs! Pyritie 2025-06-10 02:13:26 +01:00
  • 0d62bfb3e6 langs Pyritie 2025-06-10 01:03:39 +01:00
  • faa21ecbab removed giselle quest Pyritie 2025-06-09 23:33:14 +01:00
  • 443ea6996a forgor one of the giselle recipes Pyritie 2025-06-09 23:33:00 +01:00
  • e77ca60a26 revert new raw iron texture Pyritie 2025-06-09 23:21:48 +01:00
  • bfc4a46f68 remove ad-astra-giselle-addon, tweak netherite spacesuit recipes Pyritie 2025-06-09 23:21:36 +01:00
  • 8145a468f3 Updated changelog (#1152) Redeix 2025-06-09 16:15:16 -05:00
  • 64c4cce30a Update piglin_disguise_block.json (#1151) Redeix 2025-06-09 16:11:34 -05:00
  • 5d3f50daeb fix railways cap decolor recipe Pyritie 2025-06-09 21:51:53 +01:00
  • cf7fc7f4d1 Merge branch 'dev' into feature/create-6 Pyritie 2025-06-09 21:15:33 +01:00
  • 9c41fe262f merge Pyritie 2025-06-09 21:15:19 +01:00
  • 84041d2e00 changelog Pyritie 2025-06-09 21:08:50 +01:00
  • f9d2130192 changelog Pyritie 2025-06-09 21:05:26 +01:00
  • 917da8d00e Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Pyritie 2025-06-09 21:01:11 +01:00
  • 5be2eb1d99 welcome back stonecutter Pyritie 2025-06-09 21:01:09 +01:00
  • 86a35b7386 turned on the EMI default recipe button by default Pyritie 2025-06-09 20:50:40 +01:00
  • 2b3a1d8ee2 Conductor (#1144) Jean Roberto de Souza 2025-06-09 15:34:05 -03:00
  • 1a5867d956 fixes #1107 Pyritie 2025-06-09 18:59:05 +01:00
  • fd7ae525ff langs Pyritie 2025-06-09 18:52:20 +01:00
  • d3a47fa04f changelog Pyritie 2025-06-09 18:51:11 +01:00
  • c11e13c949 fixes #1149 Pyritie 2025-06-09 18:46:30 +01:00
  • 158f2c112c gregtech facade crafting (#1145) GameStar 2025-06-09 10:56:02 -05:00
  • 2a0f11bd15 Include ElytraServers/Greate-Encased-Cogwheel-Drop-Fix (#1148) 2025-06-09 23:54:04 +08:00
  • e4014d1d6e Small fixes for Empty Jar, Beekeeper quest and Assembler Chute (#1142) TomPlop 2025-06-08 17:22:01 -04:00
  • 8beb9ba090 Conflict issues fix (#1141) Jean Roberto de Souza 2025-06-08 18:21:46 -03:00
  • 0ab1572392 added a bunch of circuits to create's assembler recipes Pyritie 2025-06-07 23:29:34 +01:00
  • a830260b71 chorus/lightbloom stuff Pyritie 2025-06-07 23:03:41 +01:00
  • 55a27896c4 moon noise tweaks Pyritie 2025-06-07 21:55:34 +01:00
  • 65b9055e34 does this fix the weird squares with structures? Pyritie 2025-06-07 21:29:57 +01:00
  • 29a713cb6c asurine dust + centrifuge recipes Pyritie 2025-06-07 21:29:41 +01:00
  • 80e25ff6d9 langs Pyritie 2025-06-07 20:34:25 +01:00
  • 2180da4932 cc recipe tweaks Pyritie 2025-06-07 20:06:27 +01:00
  • 4615f3564a mysterious cube recipe Pyritie 2025-06-07 20:06:20 +01:00
  • fdfca2ecc8 langs Pyritie 2025-06-07 19:17:01 +01:00
  • ce1f8a4b80 adjusted the brightness of the generated raw ore textures Pyritie 2025-06-07 19:04:02 +01:00
  • adc9932c2e removed FE cables 💔 Pyritie 2025-06-07 18:52:45 +01:00
  • 5805f9c082 fixed ad astra's lamps so they actually emit light lmao Pyritie 2025-06-07 18:26:58 +01:00
  • 7075f7eff1 we love material unification Pyritie 2025-06-07 18:13:04 +01:00
  • 6cb1602455 more recipe tweaks Pyritie 2025-06-07 17:59:51 +01:00
  • cb60215f5a tfc-ambiental tooltips for space suits Pyritie 2025-06-07 17:59:39 +01:00
  • c359174053 langs Pyritie 2025-06-07 17:52:32 +01:00
  • b36a2c1741 oh yeah there's no etrium ore Pyritie 2025-06-07 17:06:43 +01:00
  • 3ccc700676 ore vein updates Pyritie 2025-06-07 16:57:39 +01:00
  • e1c76bb03a desh raw ore block change Pyritie 2025-06-07 16:56:52 +01:00
  • f6d16409ec chorus flower loot table Pyritie 2025-06-07 16:07:19 +01:00