Commit Graph

  • 0845aed8f9 Revert "Dev -> space sync" ofoxsmith 2025-06-22 15:57:28 +10:00
  • be9e510584 Merge pull request #1207 from TerraFirmaGreg-Team/revert-1205-dev Redeix 2025-06-22 00:46:55 -05:00
  • e2a04c8c25 Revert "Dev -> space sync" Redeix 2025-06-22 00:46:22 -05:00
  • e2f6514f44 Merge pull request #1205 from TerraFirmaGreg-Team/dev Redeix 2025-06-22 00:43:27 -05:00
  • 2138a8b0dc Merge branch 'feature/space' into dev Redeix 2025-06-22 00:40:02 -05:00
  • 8e9f1c51ab changelog Pyritie 2025-06-21 11:06:05 +01:00
  • 1c7aff030a changed clay bricks to extruder/curving press instead of assembler Pyritie 2025-06-21 11:05:32 +01:00
  • d551b40d3a tweaked glowstone, added purpur recipes, changelog Pyritie 2025-06-21 10:57:49 +01:00
  • 02303f349b fixed recipe conflict with mushroom blocks Pyritie 2025-06-21 10:57:11 +01:00
  • d205f76aa1 fixed some models needing particles Pyritie 2025-06-21 10:56:54 +01:00
  • d3f0bcd6d6 added space suit fabric Pyritie 2025-06-21 10:56:44 +01:00
  • 6f8a70ef54 added dry ice to calorie paste recipe Pyritie 2025-06-20 23:58:11 +01:00
  • ca87c96ee7 no circuit needed here Pyritie 2025-06-20 23:57:07 +01:00
  • 4914fa660d Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Pyritie 2025-06-20 23:16:37 +01:00
  • 5b65ac70e6 whoops Pyritie 2025-06-20 23:16:35 +01:00
  • b0fb9e3e9a ABS glowstone recipe (#1202) 34y34y34y34y34y34y34y34y34y 2025-06-21 00:17:05 +03:00
  • 5d5479d02a Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Pyritie 2025-06-20 21:03:29 +01:00
  • 9d0d152fb9 removed better foliage again + visual workbench (doesn't handle recipes with greg tools very well) Pyritie 2025-06-20 21:03:27 +01:00
  • f5cb4fb013 whitelisted glue for wood buckets/barrels Pyritie 2025-06-20 21:02:41 +01:00
  • 54f30d5cc6 lunchbox update into Pakku (#1200) Thomasx0 2025-06-20 20:33:02 +03:00
  • 5ef550f0c2 changed dry ice and calorie paste recipes (#1201) Redeix 2025-06-20 12:18:06 -05:00
  • c567450875 - Lots of food stuff (#1196) Redeix 2025-06-20 03:49:39 -05:00
  • 3428588b25 Merge branch 'feature/space' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into feature/space Pyritie 2025-06-19 20:20:19 +01:00
  • 84b36479e0 changed rhyolite to use moon sand instead of white sand Pyritie 2025-06-19 20:20:16 +01:00
  • 316b116af5 comments Pyritie 2025-06-19 17:30:46 +01:00
  • 6103b87de0 changelog Pyritie 2025-06-19 13:17:15 +01:00
  • 0bc679107a removed burpflower field guide page Pyritie 2025-06-19 13:16:51 +01:00
  • abae0a8c9f changelog Pyritie 2025-06-19 13:10:58 +01:00
  • 8f3eac722b Merge branch 'dev' into feature/space Pyritie 2025-06-19 13:10:11 +01:00
  • afc88dda91 changelog, added blood lily to klayze loot Pyritie 2025-06-19 13:09:46 +01:00
  • 6f4ec99446 changelog Pyritie 2025-06-19 13:03:28 +01:00
  • 4eb9dcd4fc reorganized stone dusts, nerfed them a bit more Pyritie 2025-06-19 13:03:23 +01:00
  • 1519fc82db merge Pyritie 2025-06-19 12:12:57 +01:00
  • 5f7b9dd291 changelog Pyritie 2025-06-19 12:11:56 +01:00
  • 0b05648189 fixed a few other steel items being extractable in LV Pyritie 2025-06-19 12:11:06 +01:00
  • 5b17e57331 nerfed lava aqueous accumulator a bit Pyritie 2025-06-19 10:50:28 +01:00
  • 25530b72c5 cleaned up some of the tfc data files, also added moon meat! Pyritie 2025-06-19 00:18:27 +01:00
  • 59481eb03c hid the netherite space suit recipes, tweaked the normal space suit a little Pyritie 2025-06-19 00:13:22 +01:00
  • eef2628484 Merge branch 'feature/space' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into feature/space Pyritie 2025-06-18 20:27:54 +01:00
  • 67215fba92 one of the mud hut structures had an old gregtech zinc ingot Pyritie 2025-06-18 20:27:51 +01:00
  • 6889dc525e - Merge current Venus progress (#1185) Redeix 2025-06-18 06:40:49 -05:00
  • 50f07fbe0c fix birt dwelling model Pyritie 2025-06-18 01:27:41 +01:00
  • 4ae60492d4 aircraft configs Pyritie 2025-06-18 01:27:34 +01:00
  • 75d2767402 I think that's how you do emissive textures? Pyritie 2025-06-18 01:02:15 +01:00
  • f6b7075d8e the other egg tag for the birt egg Pyritie 2025-06-18 01:01:58 +01:00
  • 8da1538f7a loot table for birt dwelling Pyritie 2025-06-18 01:01:45 +01:00
  • 49d33fe0d3 reduce the spawning of limpets Pyritie 2025-06-18 01:01:31 +01:00
  • 0ad57dfe3b mob changes in moon biomes since we have birts and surface limpets now Pyritie 2025-06-17 23:55:24 +01:00
  • 00c7104cb7 is this ever going to work? Pyritie 2025-06-17 22:19:34 +01:00
  • 4bc92aeda3 birt stuff Pyritie 2025-06-17 22:19:18 +01:00
  • b29361a79b trying to get the moon rabbit houses to not put squares on the ground Pyritie 2025-06-17 21:13:06 +01:00
  • 7f21277843 langs for bedrock ores Pyritie 2025-06-17 21:12:45 +01:00
  • 4f0ada9529 emi categories Pyritie 2025-06-17 21:09:10 +01:00
  • 62edf3929f species stuff and loot tables Pyritie 2025-06-17 20:44:24 +01:00
  • f646c46377 fix refrigerator in structure Pyritie 2025-06-17 20:43:47 +01:00
  • 40e8874887 Whitelisted molds and pumps for Beneath Hellforge (#1183) Indi 2025-06-17 12:31:15 -07:00
  • 1cc0aafa45 dyes Pyritie 2025-06-17 20:11:29 +01:00
  • ddf9851a42 chicken Pyritie 2025-06-17 20:07:59 +01:00
  • 54da8a20e5 oh so that's why Pyritie 2025-06-17 19:29:19 +01:00
  • 914a82a68a balance tweak? Pyritie 2025-06-17 19:24:40 +01:00
  • daa8ab0493 lang Pyritie 2025-06-17 19:24:34 +01:00
  • 01fd420f49 people are gonna hate me for this Pyritie 2025-06-17 19:24:27 +01:00
  • 3676080d13 added a second recipe for leather water flask sides Pyritie 2025-06-17 19:23:54 +01:00
  • 96d7435867 did I forget to save this last night or something...? Pyritie 2025-06-17 18:42:11 +01:00
  • a9c4bbf473 firmalife moment Pyritie 2025-06-17 17:44:31 +01:00
  • d688ee0d11 fix duplicate dyes Pyritie 2025-06-17 16:57:37 +01:00
  • 8010958030 whoops that removed the magnet icon from magnetic neodymium Pyritie 2025-06-17 16:24:59 +01:00
  • 9e3768eb5b fixed vat having the wrong fluid for dyes, added other dye fluids Pyritie 2025-06-17 16:24:44 +01:00
  • 425ef439eb added some text to the food recipes! Pyritie 2025-06-17 15:52:31 +01:00
  • 9d7c38b6ee whoops, conversion recipe was the wrong way around Pyritie 2025-06-17 14:51:25 +01:00
  • e38425d597 removed old refrigerator, added conversion to new one Pyritie 2025-06-17 14:47:42 +01:00
  • f46962f689 removed dioside, fayalite, enstatite Pyritie 2025-06-17 13:42:04 +01:00
  • d362e73055 updated veins Pyritie 2025-06-17 13:39:29 +01:00
  • 5fa52781ed fixed magnetic neodymium material set inconsistency Pyritie 2025-06-17 13:38:43 +01:00
  • 7ab8693fe2 langs Pyritie 2025-06-17 12:30:38 +01:00
  • 1ab2777fcd fixed ISPRecipeLogic path Pyritie 2025-06-17 12:20:47 +01:00
  • c13edcabdc merge food branch into space branch Pyritie 2025-06-17 12:12:43 +01:00
  • 208b916d8c - Fixed brining and smoking recipes and added drying recipes. (#1181) Redeix 2025-06-17 05:33:15 -05:00
  • 4f2a27b7b4 Merge pull request #1180 from Redeix/revert-3-feature/food Redeix 2025-06-17 01:04:35 -05:00
  • 50ad90af2a Merge branch 'active/food' into revert-3-feature/food Redeix 2025-06-17 00:57:55 -05:00
  • 2e5295614c Revert "merge" Redeix 2025-06-17 00:56:25 -05:00
  • 2c24ad385d Revert "Active/food (#1176)" (#1177) Redeix 2025-06-16 23:57:48 -05:00
  • 6c3fce648b Active/food (#1176) Redeix 2025-06-16 23:54:59 -05:00
  • fb90ef6666 Merge branch 'dev' into active/food Redeix 2025-06-16 23:54:43 -05:00
  • c211aed518 Merge pull request #3 from TerraFirmaGreg-Team/feature/food Redeix 2025-06-16 23:07:25 -05:00
  • 553c3a9702 mushroom blocks now drop way less mushroom Pyritie 2025-06-17 01:10:10 +01:00
  • 595c917ef9 langs Pyritie 2025-06-17 01:03:28 +01:00
  • bc61d06232 merge Pyritie 2025-06-17 01:02:15 +01:00
  • 4f3d8f3ec6 Merge branch 'feature/space' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into feature/space Pyritie 2025-06-17 01:01:35 +01:00
  • a96bbf2b12 updated dimension marker for the beneath, new ones for other planets Pyritie 2025-06-17 01:01:33 +01:00
  • 2d5ac8f982 Bump softprops/action-gh-release in the dependencies group (#1172) dependabot[bot] 2025-06-17 03:58:38 +05:00
  • dff7fd6196 material and rose quartz stuff Pyritie 2025-06-16 20:32:09 +01:00
  • 08b2a33443 fixed ice capsule recipe not filling it up completely Pyritie 2025-06-16 18:48:34 +01:00
  • 0fd7c2d1fd Adding glow ink recipe (#1171) GameStar 2025-06-16 12:38:29 -05:00
  • 7f11bed7eb quest updates, langs Pyritie 2025-06-16 18:37:24 +01:00
  • 0ecf73648d changelog Pyritie 2025-06-16 17:42:48 +01:00
  • 8bc9247b24 nerfed durability of wooden tongs, slightly tweaked their recipe Pyritie 2025-06-16 17:42:01 +01:00
  • 242a31b515 tweaked zinc color, added new plated block color Pyritie 2025-06-16 17:40:22 +01:00
  • 35148eaf36 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev Pyritie 2025-06-16 17:12:56 +01:00
  • b2cc4beba1 fixed some VI/rolling mill recipes that were still generating for removed items Pyritie 2025-06-16 17:12:53 +01:00