Commit graph

91 commits

Author SHA1 Message Date
Pyritie
6944cb7083 coke gem trim -> armalcolite gem trim 2025-12-15 19:12:36 +00:00
Pyritie
1b161d09f8 Revert "remove conk"
This reverts commit 15a94f150f.
2025-12-15 19:07:53 +00:00
Pyritie
15a94f150f remove conk 2025-12-15 19:06:42 +00:00
Pyritie
eb55f20a43 remove modrinth baguettelib, update greate, add vintage improvements kubejs mod, fix all the greate rose quartz namespace changes 2025-12-14 15:35:22 +00:00
Pyritie
120d6e1c43 moved drinkable data to the right namespaces, renamed tfcgurman server script dir -> tfc_gurman, moved all alcohols to #tfg:alcohols instead of #tfc:alcohols, because agedalcohols is very fussy 2025-12-09 15:48:42 +00:00
Pyritie
dd1463acdf update to forge 47.4.13, fix aged sake, fix cleanroom doors, fix butyraldehyde 2025-12-08 19:36:35 +00:00
Pyritie
5ecd67c42d made spring water drinkable 2025-12-01 15:16:16 +00:00
Pyritie
d6cf64c67b turns out jump boost 1 is basically useless 2025-11-30 22:39:05 +00:00
Pyritie
305287f98c fix drinkable defs for teas 2025-11-30 21:50:02 +00:00
Pyritie
8a5812b831 added effects to gurman drinks 2025-11-30 21:29:29 +00:00
Pyritie
04e195890d never mind, it's not fixed, because of some weird tag issue 2025-10-28 18:20:43 +00:00
Pyritie
68ca4775ba aged alcohol update, pakku 2025-10-28 17:23:19 +00:00
WIPocket
ac8ec2a9e5
double plate stacking to 16, fixes #1952 (#2051) 2025-10-18 16:22:33 -05:00
KonSola5
033b411363
Item sizes (#1778)
* Item sizes and some helpful tags

* Try putting item sizes in a KJS script (NOT TESTED)

* Move Greate tags to KJS, add sizes for various pipes and cables

* Whoops, accidentally overrode tiny pipe size

* Air duct sizes

* Prettier config and tags moved to JS
- Added `.prettierrc` file, which configures the tab width and code wrapping point for the Prettier formatter.
- Moved remaining tags from JSON to JS files.

* Delete floating carpet tag JSON

Signed-off-by: KonSola5 <125081901+KonSola5@users.noreply.github.com>

---------

Signed-off-by: KonSola5 <125081901+KonSola5@users.noreply.github.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-09-13 13:46:20 -05:00
TomPlop
3c72e94109
Adding Nuclear Line on Mars (#1467)
* Adding the Nuclear Line CPU Wafer

* merge

* Revert "merge"

This reverts commit b29b5e324f587042a7aad01a49cfdf63b33ab7b4.

* revert

* Revert "revert"

This reverts commit 38376879b37a1150bd84dfa524621c2ffe6350db.

* no change weird things happening to me

* add fluid textures

* Modification of nuclear line

* fix conflict for fluids

* first balance change

* fix conflict with recipes.rocks

* Nuclear Line

* Add the bromine line and more fixes

* Fully added back the bromine line

* Add nuclear energy line and more fixes

* fix conflit

* Add back the recipes change to gtceu for nuclear

* revert

* fix conflict

* One last try

* Adjust Reactor rates

* Added change to uranium dust commented out until Mars Update

* Remove long rod from nuclear pellet
2025-07-28 20:02:05 +01:00
Pyritie
5bb1c17eae update changelog, revert unnecessary changes from #1390 2025-07-20 12:53:25 +01:00
Eve
b98c3bc135
[🪶]: Give Aged Corn Whiskey and Aged Rye Whiskey status effects (#1390)
* Export ".json"s from TFCagedalcohol mod to TFC

Exporting effects ".json"s

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Create tfc

There is tfc/tfc/*files*
Need additional file to access them

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Delete kubejs/data/tfc/drinkables directory

not there sh*

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Delete kubejs/data/tfc/tfc

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Create tfc

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Delete kubejs/data/tfc/tfc

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Create tfc

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Delete kubejs/data/tfc/tfc

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Create ihategithub

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Exporting aged alcohol from TFCagedalcohol data

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Create alcohols.json

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

* Delete kubejs/data/tfc/tfc/ihategithub

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>

---------

Signed-off-by: Eve <93487878+EveProgrammingsockson@users.noreply.github.com>
2025-07-20 12:36:45 +01:00
Pyritie
242c91a5fe halved the frequency of caves/canyons so the world looks less ugly 2025-05-18 18:50:24 +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
Nebby
d4c80a4b61
Consolidating Development: 0.9.x (#846)
Signed-off-by: Pyritie <pyritie@gmail.com>
Signed-off-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: Pyritie <Pyritie@gmail.com>
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
Co-authored-by: TomPlop <tomdidome@gmail.com>
Co-authored-by: aidie8 <aidenvanzuilen@gmail.com>
Co-authored-by: Xikaro <os.valerievich@ya.ru>
Co-authored-by: Xikaro <55663835+Xikaro@users.noreply.github.com>
Co-authored-by: Zleub <debray.arnaud@gmail.com>
2025-04-14 19:00:08 +01:00
Dmitry
9aae394dd4 Revert "drop tfc ore gen support"
This reverts commit ac93f272a4.
2024-05-22 21:52:17 +07:00
Dmitry
ac93f272a4 drop tfc ore gen support 2024-05-14 16:05:15 +07:00
Dmitry
36de03db06 custom tfc trim recipes 2024-04-22 18:27:47 +07:00
Dmitry
e23ac60e16 Update cassiterite_andesite.json 2024-01-19 12:16:22 +07:00
Dmitry
e5fee6d0b6 Упс, это было сломано :) 2024-01-18 16:11:17 +07:00
Dmitry
b076d62602 фикс спавна гемов из тфк 2023-12-24 18:36:24 +07:00
Dmitry
1a552da56e fix loottables 2023-12-16 19:14:19 +07:00
Dmitry
c3421ff490 copy loot_tables 2023-12-11 14:49:26 +07:00
Dmitry
e95f1e93dc data shit 2023-12-08 20:07:56 +07:00
Dmitry
a9103115c4 Update cassiterite_andesite.json 2023-11-27 16:12:23 +07:00
Dmitry
628eea0366 123 2023-11-27 16:10:38 +07:00
Dmitry
b6d41c6341 panning sluicing shit 2023-11-27 16:05:57 +07:00
Dmitry
6ed8494052 update tfg mod + fix crash 2023-11-27 11:50:10 +07:00
Dmitry
4e39c1ff0a Fix #81 2023-11-27 09:54:02 +07:00
Dmitry
3dc53ec22d Fix: Рецепты ForgeHammer + qol 2023-11-25 23:59:17 +07:00
Dmitry
d291e2bf77 Fix #56 2023-11-25 13:15:14 +07:00
SpeeeDCraft
557115b42f Fix #58 2023-11-23 07:11:05 +07:00
SpeeeDCraft
3d9d0fb4cf Fix #44 2023-11-20 07:46:00 +07:00
SpeeeDCraft
093773da30 Файлы для будушей переработки промывания песка 2023-11-19 08:42:37 +07:00
SpeeeDCraft
c1f358b60f кокодае 2023-11-16 17:49:41 +07:00
SpeeeDCraft
0df11043af и ес чо, кста релиз через час 2023-11-16 17:48:54 +07:00
SpeeeDCraft
156ae14bd2 Some anvil recipes (not finished) 2023-11-16 15:31:41 +07:00
Dmitry
a6be6b406d untested anvil recipes 2023-11-16 12:56:27 +07:00
SpeeeDCraft
e9ccab3f6e finish casting 2023-11-15 22:18:13 +07:00
SpeeeDCraft
4e26fa09bc Ого, оно работает 2 2023-11-15 21:58:21 +07:00
SpeeeDCraft
0b518eeffd Нихеровый рефакторинг 2023-11-15 18:11:34 +07:00
SpeeeDCraft
1387978d9c 600+ файлов в 200 json строк (ну и кто тут умный) 2023-11-13 22:08:16 +07:00
SpeeeDCraft
01e4ed5168 remove some jsons again 2023-11-13 11:06:36 +07:00
SpeeeDCraft
2002ec3560 decrease amount of jsons (own gen script) + update tfc 2023-11-13 09:22:31 +07:00
SpeeeDCraft
c9b9ac2f98 Я конченный, бегите 2023-11-12 12:27:54 +07:00