Commit graph

3279 commits

Author SHA1 Message Date
Pyritie
6afc562845 I FORGOT TO ADD PUNISHMENT FOR DEATH 2025-05-16 01:40:03 +01:00
Pyritie
9081294a29 updated pakku 2025-05-16 00:07:23 +01:00
Pyritie
b8da3a31d2 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-05-15 23:21:50 +01:00
Pyritie
077ebdaf83 hid the new space tfg blocks 2025-05-15 23:21:48 +01:00
Pyritie
c7b3ba56b0 put tin jar lid recycling in the right category 2025-05-15 23:21:35 +01:00
Pyritie
4cf0aa8b6b langs, quest tweaks, updated field guide for sprinklers 2025-05-15 23:21:20 +01:00
Xikaro
2d0a876e35 github 2025-05-16 00:58:30 +05:00
Xikaro
c0a35f04af ISSUE_TEMPLATE 2025-05-16 00:39:17 +05:00
Pyritie
81623727e6 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-05-15 20:38:04 +01:00
Pyritie
71157ac7cf tweaked Y levels of the overworld <-> beneath teleporting 2025-05-15 20:05:32 +01:00
Xikaro
ba4cc2ecf6 ISSUE_TEMPLATE 2025-05-15 23:45:00 +05:00
Xikaro
5ea2857944 Update ENHANCEMENT.yml 2025-05-15 23:44:15 +05:00
Xikaro
22e8fd9267 Update ENHANCEMENT.yml 2025-05-15 23:41:08 +05:00
Xikaro
0bfb5007f1 Update ENHANCEMENT.yml 2025-05-15 23:40:39 +05:00
Xikaro
0498585be9 Update ENHANCEMENT.yml 2025-05-15 23:37:58 +05:00
Xikaro
6c3c575304 Update ENHANCEMENT.yml 2025-05-15 23:37:43 +05:00
Xikaro
fd91d3c098 Update ENHANCEMENT.yml 2025-05-15 23:37:14 +05:00
Xikaro
a594c48db3 Update ENHANCEMENT.yml 2025-05-15 23:36:57 +05:00
Xikaro
737f6e1749 Update ENHANCEMENT.yml 2025-05-15 23:35:56 +05:00
Xikaro
7c4ca2ba0f Update ENHANCEMENT.yml 2025-05-15 23:32:14 +05:00
Xikaro
c3476cc9c9 Update ENHANCEMENT.yml 2025-05-15 23:31:47 +05:00
Xikaro
890e183900 Update CHANGELOG.md 2025-05-15 22:45:19 +05:00
Pyritie
b1e8a852af updated changelog 2025-05-15 12:23:20 +01:00
Pyritie
448ea6f60b started a tfg space recipes file, moved the air collector ones there 2025-05-15 01:19:39 +01:00
Pyritie
973a8c7e8e added recipes for the oxygen loader 2025-05-15 01:19:17 +01:00
Pyritie
c7c170b9fe ad astra configs 2025-05-15 00:39:45 +01:00
Pyritie
4772397870 removing the gregtech material error suppression because it's just causing more confusion 2025-05-14 22:23:10 +01:00
Pyritie
36683465ff Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-05-14 21:06:32 +01:00
TomPlop
9c8369262a
Fix for Create Deco bricks conflict with Minecraft bricks in the assembler (#1005)
Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-05-14 20:59:22 +01:00
Pyritie
761f396080 removed obsidian framed pressure plate - idk what it even does, but it's causing crashes
fixes #1006
2025-05-14 20:59:01 +01:00
Pyritie
27a6f70141 fixed the basin having the wrong tag to be used with the charcoal forge 2025-05-14 20:57:48 +01:00
Risuga
165cc8d2cd
Some recipe changes (#1003)
* misc recipes

* add saw to jar lid recipe

* revert table salt name changing that didn't work
2025-05-14 19:42:32 +01:00
TomPlop
c964c4421b
Fixes for quests (#1000) 2025-05-14 18:31:06 +01:00
Pyritie
13adbc189f craters but for realsies this time 2025-05-14 01:19:17 +01:00
Pyritie
7fbd4b74c4 loot tables for "meteorites" and quartz blocks 2025-05-14 01:07:10 +01:00
Pyritie
64e50a09cc loot tables for new moon blocks 2025-05-13 22:40:23 +01:00
Pyritie
acd98975ee never mind, those craters looked bad 2025-05-13 21:12:59 +01:00
Pyritie
c8c894a653 craters...? not a huge fan of these tbh 2025-05-13 21:00:04 +01:00
Pyritie
16f9cc8501 spikes should now only generate underground 2025-05-13 20:36:55 +01:00
Pyritie
eb17a8f6d6 tweak to placement of loose moon stones 2025-05-13 20:35:17 +01:00
Pyritie
1c32bb6c49 updated langs 2025-05-13 19:46:38 +01:00
Pyritie
bd0ebec8c1 tweaks for moon spikes and warped vines, added asurine biome decoration 2025-05-13 19:41:31 +01:00
Pyritie
8dbfde3272 langs for biomes 2025-05-13 19:40:57 +01:00
Pyritie
d226fd6954 Merge branch 'feature/space' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into feature/space 2025-05-13 17:10:27 +01:00
Pyritie
af3b8a22cc moved moonbase structure to the last step of worldgen so it doesn't get stuff placed on top of it 2025-05-13 17:10:19 +01:00
TomPlop
c2d903495b
HV Quests in eng and fixes for others quests and HV integration (#998) 2025-05-13 11:09:04 -05:00
Redeix
9c258d452f
Branch merge (#995) 2025-05-13 17:08:47 +01:00
Pyritie
dc99a50fe7 fixed moon rabbit houses 2025-05-13 16:34:14 +01:00
Pyritie
96aae3ae33 finished adding spikes for all rocks 2025-05-13 16:24:00 +01:00
Pyritie
e102e89f09 added spikes for all ad astra rocks 2025-05-13 15:48:30 +01:00