illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3706 commits 1 branch 0 tags 1.5 GiB
Commit graph

441 commits

Author SHA1 Message Date
Nebby
208b2ece88
Bronze variant Mortars (#1270) 2025-07-11 08:28:33 +01:00
Pyritie
ec7e245220 orbit dim markers 2025-07-10 12:45:11 +01:00
Pyritie
8987b23b21 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-07-09 22:58:12 +01:00
Pyritie
423da664fe fucking gregtech 2025-07-09 22:58:04 +01:00
Pyritie
8013b4756d fixed the wild rapeseed/sunflowers not dropping their products 2025-07-09 21:34:07 +01:00
Pyritie
9e60fb584a fixed some damascus steel stuff still showing up 2025-07-09 21:33:51 +01:00
Redeix
7c0c3cd341
Added dry ice support for lunchboxes (#1262) 
* - Lots of ui updates. And a couple fixes.

* - New button textures.
- Fixed campfire loot table.
- Made anvil rod recipes easier.
- Added assembler recipes for multiblock tank parts.

* - Added assembler recipes for multiblock tank parts.

* - Updated Changelog

* - Some more UI tweaks.
- Added modern-markings mod with integration.

* - Updated stromatolite textures
- Added some more WIP venus foliage

* - Moved some blocks over from tfg-core.

* - Updated textures for tier-1 rocket and food oven.

* - Updated textures for more ad-astra stuff + new panorama

* - Biodiesel stuff

* - Quests re-ordering and some new ones

* - Hide wild crops from emi

* - Hide wild crops from emi

* - Moon rabbit meat

* - Moon rabbit meat

* - Moon rabbit meat textures and casings for tom

* - models

* - oops

* - rocket

* - ooops

* - Added dry ice support for lunchboxes

* - Fixed soybean oil quest

* - Added dry ice block

* - Assets for dry ice block

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-07-09 08:28:16 +01:00
Pyritie
3dffb8e93e remove ender eye, added vitrified ender pearl 2025-07-09 00:49:02 +01:00
Pyritie
54e41bf2ef 🍰🎂 2025-07-08 17:35:42 +01:00
Redeix
be23b09e9c
Machine casings for Tom and moon rabbit meat stuff I forgot to push (#1259) 
* - Lots of ui updates. And a couple fixes.

* - New button textures.
- Fixed campfire loot table.
- Made anvil rod recipes easier.
- Added assembler recipes for multiblock tank parts.

* - Added assembler recipes for multiblock tank parts.

* - Updated Changelog

* - Some more UI tweaks.
- Added modern-markings mod with integration.

* - Updated stromatolite textures
- Added some more WIP venus foliage

* - Moved some blocks over from tfg-core.

* - Updated textures for tier-1 rocket and food oven.

* - Updated textures for more ad-astra stuff + new panorama

* - Biodiesel stuff

* - Quests re-ordering and some new ones

* - Hide wild crops from emi

* - Hide wild crops from emi

* - Moon rabbit meat

* - Moon rabbit meat

* - Moon rabbit meat textures and casings for tom

* - models

* - oops

* - rocket

* - ooops

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-07-08 12:18:54 +01:00
Pyritie
3a5df84b40 species update! also some biome spawn rates of limpets, and adding create hypertubes to pakku 2025-07-08 03:19:07 +01:00
GameStar
48d4475f6b
wire cutter mold and Hypertube compat (#1258) 
* Update constants.js

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

* Update recipes.molds.js

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

* Create hypertube.png

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

* Add files via upload

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

* Create recipes.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>

* Add files via upload

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

* Update main_server_script.js

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

* Update recipes.js

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
 2025-07-08 00:12:46 +01:00
Pyritie
8b9da9c142 no idea if this is fixed in GT7 or not, but the nano/quark armor has actual armor points now 2025-07-07 21:51:04 +01:00
Pyritie
df173e17ab more unification for #898, also a workaround for #963 maybe? 2025-07-07 18:54:55 +01:00
Pyritie
4fa02ec0c9 removed cast iron tongs 2025-07-07 18:53:45 +01:00
GameStar
bf1bbe12d0
Feature/new molds (#1253) 
* Update recipes.js

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

* Update constants.js

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

* Update recipes.molds.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>

* Add files via upload

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

* Update recipes.materials.js

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

* Update recipes.materials.js

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-07-07 13:17:30 +01:00
Redeix
8949f7bc86
Moon rabbit meat stuff (#1254) 
* - Lots of ui updates. And a couple fixes.

* - New button textures.
- Fixed campfire loot table.
- Made anvil rod recipes easier.
- Added assembler recipes for multiblock tank parts.

* - Added assembler recipes for multiblock tank parts.

* - Updated Changelog

* - Some more UI tweaks.
- Added modern-markings mod with integration.

* - Updated stromatolite textures
- Added some more WIP venus foliage

* - Moved some blocks over from tfg-core.

* - Updated textures for tier-1 rocket and food oven.

* - Updated textures for more ad-astra stuff + new panorama

* - Biodiesel stuff

* - Quests re-ordering and some new ones

* - Hide wild crops from emi

* - Hide wild crops from emi

* - Moon rabbit meat

* - Moon rabbit meat

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-07-07 11:56:53 +01:00
Redeix
c6a26d49b0
Hide wild crops and forgot to push some quest stuff (#1252) 
* - Lots of ui updates. And a couple fixes.

* - New button textures.
- Fixed campfire loot table.
- Made anvil rod recipes easier.
- Added assembler recipes for multiblock tank parts.

* - Added assembler recipes for multiblock tank parts.

* - Updated Changelog

* - Some more UI tweaks.
- Added modern-markings mod with integration.

* - Updated stromatolite textures
- Added some more WIP venus foliage

* - Moved some blocks over from tfg-core.

* - Updated textures for tier-1 rocket and food oven.

* - Updated textures for more ad-astra stuff + new panorama

* - Biodiesel stuff

* - Quests re-ordering and some new ones

* - Hide wild crops from emi

* - Hide wild crops from emi

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-07-07 01:20:51 +01:00
Pyritie
aa85b679c7 added bio fuel quests, more biodiesel recipes 2025-07-06 14:08:25 +01:00
Redeix
035d55ffd5
Biodiesel Stuff (#1249) 
* - Lots of ui updates. And a couple fixes.

* - New button textures.
- Fixed campfire loot table.
- Made anvil rod recipes easier.
- Added assembler recipes for multiblock tank parts.

* - Added assembler recipes for multiblock tank parts.

* - Updated Changelog

* - Some more UI tweaks.
- Added modern-markings mod with integration.

* - Updated stromatolite textures
- Added some more WIP venus foliage

* - Moved some blocks over from tfg-core.

* - Updated textures for tier-1 rocket and food oven.

* - Updated textures for more ad-astra stuff + new panorama

* - Biodiesel stuff

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-07-06 11:56:14 +01:00
Pyritie
a9eab2e3b9 some more tweaks 2025-07-06 01:40:01 +01:00
Pyritie
4dcbd46a0b space food tag 2025-07-05 19:41:19 +01:00
Pyritie
0848393225 cleanup of #1248 
Related Work Items: #12
 2025-07-05 13:12:08 +01:00
Pyritie
e20945790c oops we had two fluix blocks 2025-07-05 12:54:09 +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
18fdc5a811 desh needs an EBF now 2025-07-05 02:43:18 +01:00
Pyritie
9bccf4fa3b merge 2025-07-05 01:41:34 +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
346e825351 🐇 2025-07-05 01:40:59 +01:00
Redeix
256d976531
Moved some items from tfg-core (#1242) 
* - Lots of ui updates. And a couple fixes.

* - New button textures.
- Fixed campfire loot table.
- Made anvil rod recipes easier.
- Added assembler recipes for multiblock tank parts.

* - Added assembler recipes for multiblock tank parts.

* - Updated Changelog

* - Some more UI tweaks.
- Added modern-markings mod with integration.

* - Updated stromatolite textures
- Added some more WIP venus foliage

* - Moved some blocks over from tfg-core.

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-07-04 00:01:20 +01:00
Redeix
2c834b527d
Updated stromatolite textures + some new venus foliage (#1234) 
* - Lots of ui updates. And a couple fixes.

* - New button textures.
- Fixed campfire loot table.
- Made anvil rod recipes easier.
- Added assembler recipes for multiblock tank parts.

* - Added assembler recipes for multiblock tank parts.

* - Updated Changelog

* - Some more UI tweaks.
- Added modern-markings mod with integration.

* - Updated stromatolite textures
- Added some more WIP venus foliage

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-07-01 12:04:14 +01:00
Pyritie
be7995a04e oxygenated climate stuff 2025-07-01 02:35:32 +01:00
Pyritie
9107d124a8 cheese 2025-07-01 01:12:38 +01:00
Pyritie
d544b43a0a oh yeah, kubejs-tfc fixed this 2025-06-30 00:03:29 +01:00
Pyritie
7519e85fea merge 2025-06-29 20:11:55 +01:00
Pyritie
2c564ab3f3 convert the nether mushrooms into the new plant block builder type too 2025-06-29 20:11:31 +01:00
Pyritie
710db0a913
added a bunch of plants from Better End, tags, recipes, license, credits (#1229) 2025-06-29 20:10:37 +01:00
Pyritie
39c847a561 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-06-29 20:06:41 +01:00
Pyritie
282a20e2cd hid the tfg icon from jei 2025-06-29 20:03:35 +01:00
Redeix
f7ec600f13
Modern markings integration (#1228) 
* - Lots of ui updates. And a couple fixes.

* - New button textures.
- Fixed campfire loot table.
- Made anvil rod recipes easier.
- Added assembler recipes for multiblock tank parts.

* - Added assembler recipes for multiblock tank parts.

* - Updated Changelog

* - Some more UI tweaks.
- Added modern-markings mod with integration.

---------

Co-authored-by: Pyritie <pyritie@gmail.com>
 2025-06-29 20:02:42 +01:00
Pyritie
d7a47307c3 removed the other ad astra material components (for now) 2025-06-28 00:57:50 +01:00
Kayla
50340ec0df
Changes the greg wood plank and treated wood plank recipes to follow a more realistic processing chain (#1223) 
* adds MDF, reworks treated wood and normal wood plate crafting chains

* removes treated wood plank from the minecraft:planks tag
 2025-06-27 22:37:27 +01:00
Pyritie
92351f718a idk entity stuff 2025-06-27 00:16:23 +01:00
Pyritie
dad9acede5 started moon rabbit entity 2025-06-26 01:30:03 +01:00
Pyritie
f1cf6919fb corrected average temp in orbits, since spacesuits have ambiental compat now 2025-06-25 00:16:23 +01:00
Pyritie
161e2185cf added back ad astra oxygen loader JEI page, removed greate haunting + ae2 entropy 2025-06-24 23:48:06 +01:00
Pyritie
b6d9994f36 cleaning up some todos 2025-06-24 17:27:15 +01:00
Pyritie
072263a981 added, changed, removed recipes and things for create + its addons 2025-06-24 16:56:55 +01:00
Pyritie
b4ef70ac63 redo dff7fd6 2025-06-24 15:06:38 +01:00
Pyritie
8ee2c6a817 redo of 242a31b 2025-06-24 14:53:32 +01:00