Commit graph

886 commits

Author SHA1 Message Date
TomPlop
c6a2206d9e
Fixes for MV Quest (#1031)
* Fix quest for electrolyzer in MV

* Fix for MV quest
2025-05-18 18:51:55 +01:00
Xikaro
b470d187e7 test 2025-05-18 22:27:41 +05:00
Xikaro
4b37c9eb02 Update occlusion.properties 2025-05-18 22:20:51 +05:00
Xikaro
ee1585ee79 config + replace open-parties-and-claims 2025-05-18 22:15:49 +05:00
Pyritie
8fed595b82 some quest tweaks 2025-05-18 18:00:43 +01:00
Pyritie
b72c9fbeaa merge 2025-05-18 12:24:48 +01:00
TomPlop
0316f88995
Fix Electrolyzing lang formate for moon update (#1032) 2025-05-18 00:33:35 +01:00
NobleWasTaken
5cf2df7781
Updated carryon-common.toml for afc (#1023)
Undated the carryon config file to include the arborafirmacraft chests in the whitelist

Signed-off-by: NobleWasTaken <137561393+NobleWasTaken@users.noreply.github.com>
2025-05-16 18:23:05 -05:00
TomPlop
917b626257
Bedrock miner for the moon (#1021)
* bedrock vein moon

* Bedrock miner implementation

* adding mica vein and fixing vein id with tfg

* fix for id mica vein
2025-05-16 18:03:18 +01:00
Pyritie
4cf0aa8b6b langs, quest tweaks, updated field guide for sprinklers 2025-05-15 23:21:20 +01:00
Pyritie
71157ac7cf tweaked Y levels of the overworld <-> beneath teleporting 2025-05-15 20:05:32 +01:00
Pyritie
c7c170b9fe ad astra configs 2025-05-15 00:39:45 +01:00
TomPlop
c964c4421b
Fixes for quests (#1000) 2025-05-14 18:31:06 +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
Pyritie
9262133484 merge 2025-05-13 10:55:31 +01:00
Pyritie
92d0146ee0 changed default flywheel setting back to instanced 2025-05-11 17:54:10 +01:00
Pyritie
b9af0c3afe quest fixes, lang strings 2025-05-11 15:55:19 +01:00
Pyritie
ec576813c2 Merge branch 'dev' into feature/space 2025-05-08 22:15:15 +01:00
Pyritie
22aa00116f fixed a bunch of the gregtech quests getting lost in a merge 2025-05-07 22:12:31 +01:00
Pyritie
a2b238a58d fixed some quest dependencies 2025-05-07 21:35:58 +01:00
Pyritie
76b1fb005d disable pollution until gt implements a better system 2025-05-07 14:51:45 +01:00
Redeix
6b364bcf01
Quick Fixes (#962)
* - Fixed hide duping recipes.
- Added quest book and field guide instances for fishing nets.
- Fixed rebar support recipe crash.
- Fixed red steel flask dupe.
- Fixed red alloy recipe inconsistency.

* - Fixed blue steel backpack block lang

* - Added max vessel fluid warning to small vessels.

* - Moved red steel flask recipe
2025-05-07 09:26:11 +01:00
Redeix
1ff39403c8
Merge pull request #960 from AirRice/bugfix/rubber_softlock
FIX: Rubber softlock
2025-05-06 14:15:02 -05:00
AirRice
ea6db58b06 FIX: Rubber softlock
- Made Vacuum Chamber craftable with ULV Casings rather than hulls (being the precursor to ULV vac tubes I think this is fair)
- Quest updates to show rubber line changes more clearly (remove dependency on extractor, change it to Vac chamber)
2025-05-06 20:00:21 +01:00
Pyritie
fb9988f5f6 Merge branch 'dev' into feature/space 2025-05-06 12:36:09 +01:00
Pyritie
d87d73f7de fixed wrong quest dependency for coke/anthracite 2025-05-06 12:32:15 +01:00
Redeix
a64bf60031
Merge pull request #956 from deneth-weerasinghe/dev
Fxed some more translation key errors in tfg_tips
2025-05-05 16:10:59 -05:00
Deneth Weerasinghe
def603b1a2 fixed some more translation key errors 2025-05-05 22:00:59 +01:00
Xikaro
7ffb799cfb defaultconfigs 2025-05-06 01:10:32 +05:00
Pyritie
38219fdb98 Merge branch 'dev' into feature/space 2025-05-05 16:08:00 +01:00
Pyritie
13d6102628 update configs 2025-05-04 17:16:52 +01:00
Pyritie
305a433179 oops, missed quest langs 2025-05-04 15:18:56 +01:00
Pyritie
f5e25962fe Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-05-04 15:06:00 +01:00
AirRice
f92a1becf1
Rubber processing recipes audit (#949)
* Rubber recipe changes
- Latex can now be extracted from rubber trees' logs, saplings, leaves via the vacuum chamber (ULV) or extractor(LV)
- values: 1000mB per log, 100mB per sapling, 50mB per leaves; Extractor recipes do this in bulk and output 1000mB per operation
- Dandelions and goldenrods can, with added sodium hydroxide, be turned into latex in a chem reactor
- Sticky resin recipes (from both conifer pitch and latex) require wood ash now instead of sulfur
- Latex -> Vulcanized latex recipe now requires sulfur instead of wood ash
- Vulcanized latex now becomes raw rubber pulp in a solidifier or vacuum chamber at a rate of 250mB/raw pulp
- Latex soaked glove recipe now is a barrel recipe that takes 50 seconds instead of a vat recipe

* Correctly set latex soaked gloves recipe to 50 seconds (was 100 seconds in previous commit)

* Quest/patchouli book updates
- Tried to catch every mention of the old rubber making recipes.

* Revert Latex-soaked gloves recipe change as it didn't need to change
- Originally I wanted to make vulc latex -> raw rubber a Vat recipe, this isn't the case anymore so there is no reason to change this recipe.

* Rebalanced recipe values
- Logs now only give 250mB of latex
- Increase overall in time required vacuumizing directly into latex (now roughly takes 150 seconds per 1000mB, logs slightly faster)
- Gregtech fluid extraction recipes for these have been rebalanced to be around 4x faster and in bulk (roughly 37.5 seconds per 1000mB, logs slightly faster)
- Made vacuum chamber recipes use kubejs tag: field for allowing tags in recipe

* Lang & Quest updates
- Changed rubber ingot quest dependency to be on vacuum chamber instead of extractor
- Removed LV circuit quest dependency on rubber (this hasn't required rubber for a while)
- Lang changes - fix ambiguous wording, typos, titles too long for book
2025-05-04 15:05:50 +01:00
Pyritie
c4ddd093b9 updated the greate mixer workaround quest 2025-05-04 15:05:19 +01:00
Pyritie
c9bbe83898 added death punishment mod + config 2025-05-04 15:00:32 +01:00
Pyritie
df2ff41aa1 new main menu panorama! 2025-05-04 14:11:05 +01:00
Xikaro
51688f4d6c fix: gui_main_menu 2 2025-05-04 16:48:53 +05:00
Pyritie
2c557155ed Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-05-04 12:21:49 +01:00
Xikaro
5272ff116c fix: gui_main_menu 2025-05-04 16:17:32 +05:00
Pyritie
85a8456b8f doubled capacity of greate shafts! also adjusted the alternator to match 2025-05-04 11:53:11 +01:00
TomPlop
497795a2bc
Mv quest rework (#920)
* Changes for MV Quests

* First fix for Progression tab

* fixes lang title

Signed-off-by: TomPlop <tomdidome@gmail.com>

* Changes for LV, fixes for quest categories, adding GT Tips, adding Gregtech energy, rework of Progression tab

* fix macerator separator

---------

Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-05-03 22:16:09 +01:00
Nebby
00d37d99d9
Fix tips quest issues (#937) 2025-04-30 01:07:03 +01:00
Pyritie
7c86ce53c0
Merging space stuff from my own fork into the main repo (#935)
* ignore .vs

* initial commit of ~space~

* fixed planets in config

* adding ore blocks to anorthite, renamed moon deepslate to dunite

* added moon ore veins, adjusted earth ones, added separate rock blocks

* added new buds for the new minerals, adjusted veins again

* forgot to add titanium to the moon!

* added moon zombies

* adjusted veins + added endermites

* first step to the moon

Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>

* change sky colors back to black

* added ad astra ores

* add desh veins to the moon

* added missing certus clusters

* adding desh veins/loc

* adding meteors + rabbit houses

* cheeeeeeese

* replaced meteor concrete with sky stone

* burying the meteors a little more

* initial commit of ores to field guide tool

* updated mineral data with new space ores

* fixed trapdoor orientation

* added anorthite rocks/bricks, changed names of cut deepslate, made cut deepslate + asurine visible

* changed average moon temp

* First Push

* split 'for' value into arrays, added russian

* pillars are stone, not metal

* adjusting spawns (again)

* oh so that's how charge and energy budget work

* added recipes for the create decoration blocks

* bricks and rocks

* remove ad astra recipes

* added limpets to the moon

* Landing on Mars

Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>

* Man thats a lot

* added translations for vein types, rock types, and added ukranium

* rabbit adjustments

* removed cooking anorthite cobble into raw

* Pushin P

* Parity

* Move translation tokens to the language tokens JSON

* Remove bin and obj

* Update .gitignore

* Update .gitignore

Signed-off-by: Pyritie <pyritie@gmail.com>

* moon mobs again

* Ore Index being Written

* More PRogress

* Improve string formatting

* toned down realgar

* structures! shulkers! oh my!

* Some progress on the vein index writing

* replace obsidian with scorchia in meteors

* meteor adjustments

* Actual vein index

* add globes to loot table

* Project Completed

* added solar power values

* adjusted ad astra recipes, hid some of the items, added bedrock ores

* more fiddling with structures

* made the rover a bit cheaper

* comply with review

* anorthite dust

* retextured shulkers

* disabled stuff from species/endermanoverhaul

* texture tweak

* recipe tweak

* fixed space rocks being invisible on the map for some reason

* removed earth bauxite vein

* mars rock

* mars stuff

* starting work on mars biome generation

* put biomes in folders

* climate stuff

* more mars worldgen

* added carve tag to space blocks

* move to correct folder

* removed veins

* added armalcolite to the moon

* anorthite -> anorthosite

* plagioclase -> syenite

* dunite -> basanite

* what is climate

* climates again

* mars rock layers

* fixed the temps!

* Update tags.js

Signed-off-by: Pyritie <pyritie@gmail.com>

* Add a Solution file

* adding this back

* remove tools folder since it was moved to a different repo

* some stuff that didn't merge

* updates

* merges

* merges

---------

Signed-off-by: SverhRazum-Nah <leon.trol@mail.ru>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: SverhRazum-Nah <leon.trol@mail.ru>
Co-authored-by: Nebby1999 <nebby131999@gmail.com>
2025-04-29 19:38:01 +01:00
Pyritie
4fb23f4e94 will you leave me alone if I submit these, ftbquests? 2025-04-29 00:21:58 +01:00
Redeix
26322a1550
Merge branch 'TerraFirmaGreg-Team:dev' into dev 2025-04-28 13:17:10 -05:00
Redeix
1d47b73d4d - Missed this commit last time oops 2025-04-28 13:16:17 -05:00
NobleWasTaken
1a811cff18
Update carryon-common.toml
Carry On's config doesn't seem to work with tags (#), so I explicitly added the framedblocks chest and the tfc chests to the whitelist. I also removed storage drawers since they aren't in use.

Signed-off-by: NobleWasTaken <137561393+NobleWasTaken@users.noreply.github.com>
2025-04-28 05:33:32 -04:00
Pyritie
c1c9382d26 fixed stress levels on the rolling mill 2025-04-27 17:11:32 +01:00
Pyritie
9eccbdcfa3 added anvils to the progression chapter 2025-04-26 19:13:42 +01:00