Commit graph

4792 commits

Author SHA1 Message Date
TomPlop
73fe5c4e4e
Fix quest title (#1809)
* Quest rework for EV

* Fix lang file quests
2025-09-12 19:09:37 +01:00
Pyritie
45d7dc015d added persistance nbt tag 2025-09-12 00:49:34 +01:00
Pyritie
e04364ba1d started work on the intact houses 2025-09-12 00:22:06 +01:00
Pyritie
79a8c52e21 jigsaws for mobs 2025-09-12 00:21:52 +01:00
Pyritie
595b53093f
Merge branch 'main' into dev 2025-09-11 08:40:19 +01:00
Pyritie
4958d12a89 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-11 08:36:11 +01:00
Pyritie
d0546f2acc pakku + cl for 0.10.13 2025-09-11 08:35:59 +01:00
Pyritie
fc1e53f99f langs 2025-09-11 08:32:12 +01:00
GameStar
582bb3e06f
Somebody did an oopsie (#1794)
Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
2025-09-10 21:26:07 -05:00
Pyritie
e73f06aee2 quest langs 2025-09-11 01:03:58 +01:00
Pyritie
c04af52bcb Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-11 01:03:39 +01:00
TomPlop
75d9e9c1ff
Quest rework for EV (#1793) 2025-09-11 01:03:30 +01:00
Pyritie
586259a18d changelog 2025-09-11 01:02:31 +01:00
Pyritie
d8dae2b192 moon ore vein tweaks 2025-09-11 00:51:17 +01:00
Pyritie
9059d6762e got recycling working for the substation. Somehow. Don't ask, idk either 2025-09-11 00:16:30 +01:00
Pyritie
bbab7303da update autopack director 2025-09-11 00:07:18 +01:00
Pyritie
bcab4e62fb changelog 2025-09-10 23:14:24 +01:00
TomPlop
be612c8fec
Balance stuffs (#1790) 2025-09-10 22:03:42 +01:00
Xikaro
063dd0364b re add RESOURCE_PACK 2025-09-11 01:06:13 +05:00
Xikaro
b08b18e702 ref: ftb json 2025-09-10 16:31:24 +05:00
Pyritie
5a17891a39 fix ad astra wood window panes recipe 2025-09-09 23:55:49 +01:00
Pyritie
fef9da7d42 added missing recipes for macaw's barbed wire fences, replaced some of its other inputs with tags 2025-09-09 23:43:19 +01:00
Pyritie
efe6d0c7dc crackrack now uses netherrack dust 2025-09-09 23:30:48 +01:00
Pyritie
eae57fdb6a Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-09 23:11:47 +01:00
Pyritie
abee8b04e9 whoops 2025-09-09 23:11:38 +01:00
TreyR9
9bb312679b
Bulk Boiling (#1784)
Added Vat recipe for boiling salt water into salt, if any of the salt water-related recipes break in the future then this is the likely culprit

Signed-off-by: TreyR9 <106098556+TreyR9@users.noreply.github.com>
2025-09-09 16:58:27 -05:00
Pyritie
be3669a17d gave the tools some random damage 2025-09-09 22:10:22 +01:00
Pyritie
d6fcdb7931 more illager loot table changes, added earlier craftable tipped arrows 2025-09-09 21:55:10 +01:00
Pyritie
2e0406e8d6 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-09 21:27:46 +01:00
Pyritie
6a7a342ff7 mist? or beast? 2025-09-09 21:27:44 +01:00
Pyritie
7805e8bcb1 loot tweak 2025-09-09 21:25:58 +01:00
Pyritie
a273790245 primitive creatures update! 2025-09-09 21:20:20 +01:00
Pyritie
ee4321c71c tiny quest tweak 2025-09-09 21:19:51 +01:00
TreyR9
301701edfb
Update recipes.js (#1779)
Consistency change for sugar water in the vat/mixer

Signed-off-by: TreyR9 <106098556+TreyR9@users.noreply.github.com>
2025-09-09 11:24:59 -05:00
Xikaro
9e9a15154d
Merge pull request #1777 from TerraFirmaGreg-Team/dev
Release: 0.10.12
2025-09-09 19:25:15 +05:00
Xikaro
8af43a10ae Update build.yml 2025-09-09 18:49:32 +05:00
Pyritie
3763a59641
Merge branch 'main' into dev 2025-09-09 14:41:22 +01:00
Pyritie
04510a26c8 gomenyasorry 2025-09-09 14:38:54 +01:00
Pyritie
a64a678838 langs, fixed a few nether brick items being hidden 2025-09-09 14:36:33 +01:00
Pyritie
69e152f7d3 pakku 2025-09-09 14:28:39 +01:00
Pyritie
65d2915038 excluded lunchbox and mob net field guide pages 2025-09-09 13:34:40 +01:00
Pyritie
48309eb375 pakku 2025-09-09 12:59:52 +01:00
Pyritie
ae699faf1e remove priority 2025-09-09 11:59:41 +01:00
Pyritie
9107a122c4 fix missing empty syringe model 2025-09-09 11:56:23 +01:00
Pyritie
4d323b4ed3 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-09-09 11:51:15 +01:00
Pyritie
aa12ac3f43 fix stone stuff 2025-09-09 11:51:09 +01:00
dependabot[bot]
3d4f412070
Bump the dependencies group with 2 updates (#1763)
Bumps the dependencies group with 2 updates: [actions/github-script](https://github.com/actions/github-script) and [softprops/action-gh-release](https://github.com/softprops/action-gh-release).


Updates `actions/github-script` from 7.0.1 to 8.0.0
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v7.0.1...v8.0.0)

Updates `softprops/action-gh-release` from 2.3.2 to 2.3.3
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/softprops/action-gh-release/compare/v2.3.2...v2.3.3)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-version: 8.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
- dependency-name: softprops/action-gh-release
  dependency-version: 2.3.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Xikaro <os.valerievich@ya.ru>
2025-09-09 15:40:31 +05:00
Pyritie
93b7518278 merge langs 2025-09-09 11:25:01 +01:00
Xikaro
ce12b1ca93 Update build.yml 2025-09-09 13:26:26 +05:00
TomPlop
f2aae5356a
Fix recipe Ostrum Fab (#1771)
Forgot to change the name

Signed-off-by: TomPlop <tomdidome@gmail.com>
2025-09-09 01:27:14 -05:00