Commit graph

4443 commits

Author SHA1 Message Date
Pyritie
4395da4c2b fix #1639
Related Work Items: #1
2025-08-21 12:15:07 +01:00
Pyritie
dbed48eedf update CL 2025-08-21 12:13:49 +01:00
Pyritie
a2a30eb84b sterling silver alloy smelter 2025-08-21 12:06:38 +01:00
Pyritie
4cfe059c71 merge 2025-08-21 12:02:01 +01:00
Pyritie
08011735a1 whitespace? github tweakin again 2025-08-21 12:01:02 +01:00
TomPlop
4d801d9c96
Disable energy p2p (#1661)
* github being github

* First bandage fix for removing FE P2P
2025-08-21 09:42:07 +01:00
Redeix
6134da9caf
Update CHANGELOG.md
Signed-off-by: Redeix <brayden.j.m.ford@gmail.com>
2025-08-21 02:36:22 -05:00
Redeix
2f4b9fa954
Feature/quick fixes (#1664)
* Some reflector block fixes

* Trim tool changes

* Added rose gold alloy smelter recipes
2025-08-21 02:33:46 -05:00
Redeix
cd085be512
Updated tooltip file to use lang strings (#1663) 2025-08-21 00:27:42 -05:00
Pyritie
3f3e1133c2 false alarm 2025-08-21 00:12:09 +01:00
Pyritie
75d497ad5d with great power comes great responsibility 2025-08-20 23:37:31 +01:00
Vincent
59ad85e08f
FIx deathMessage typo and improve grammar (#1642)
* fix deathMessage typo

* Some more death message improvements

* add new death messages

---------

Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-08-19 17:56:02 -05:00
dependabot[bot]
3372a085e2
Bump devops-infra/action-pull-request in the dependencies group (#1653)
Bumps the dependencies group with 1 update: [devops-infra/action-pull-request](https://github.com/devops-infra/action-pull-request).


Updates `devops-infra/action-pull-request` from 0.6.0 to 0.6.1
- [Release notes](https://github.com/devops-infra/action-pull-request/releases)
- [Commits](https://github.com/devops-infra/action-pull-request/compare/v0.6.0...v0.6.1)

---
updated-dependencies:
- dependency-name: devops-infra/action-pull-request
  dependency-version: 0.6.1
  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>
2025-08-19 11:49:41 +05:00
GameStar
3521adc4de
idk some recipes (#1635)
Co-authored-by: Redeix <brayden.j.m.ford@gmail.com>
2025-08-15 22:20:48 -05:00
Pyritie
3359855923 fix shape of old growth strophar trees 2025-08-16 03:22:01 +01:00
Pyritie
570072fccb made ponds a little more common 2025-08-16 03:03:14 +01:00
Pyritie
39db363896 made crops a little rarer, grasses a little more common 2025-08-16 03:02:29 +01:00
Pyritie
b42f535264 added regular endermen back 2025-08-16 02:58:19 +01:00
Pyritie
4a0c61c240 tags for wab 2025-08-16 02:55:54 +01:00
Pyritie
f2380e9ebd tree stuff 2025-08-16 02:55:49 +01:00
Pyritie
c6fbc05290 biome tweaks, adding some mobs, reducing amount of endermen 2025-08-16 02:55:28 +01:00
Pyritie
0ed457001d fix typo in loot pool 2025-08-16 00:45:29 +01:00
Pyritie
b2660923c6 space suit capacity changelog 2025-08-16 00:16:03 +01:00
Pyritie
a341470cee removed cobalt oxide's meltability #1634 2025-08-15 23:30:14 +01:00
Pyritie
427b77e99a fiddling with forest noise 2025-08-15 23:05:22 +01:00
Pyritie
81b3dcc8e4 butn 2025-08-15 23:05:10 +01:00
Pyritie
f57564d3a0 Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev 2025-08-15 22:47:58 +01:00
Pyritie
beed3094f3 buttons again #1625 2025-08-15 22:47:44 +01:00
GameStar
03106270e1
Feature/wan creatures and stuff (#1633)
* whitespace changes

* some animal compat

* snifferified recipes

* nest box recipe

* tag stuff

* spawn stuff

* tooltip

* wan config

* foods

* loot tables

* Update pakku-lock.json

* Update wan_ancient_beasts-server.toml

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

* Update tags.js

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

---------

Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
2025-08-15 22:45:09 +01:00
Pyritie
aad81501af update forge 2025-08-15 22:14:31 +01:00
Pyritie
7b559cedf1 pakku 2025-08-15 22:04:15 +01:00
Pyritie
f844601b55 adding meat tag to cruncher foods 2025-08-15 21:40:02 +01:00
Pyritie
ce2a38285c added 3 more mars trees + tfc-style saplings for all 6 2025-08-15 02:14:07 +01:00
Pyritie
90ce71d94a mars biome particle tags 2025-08-15 01:17:18 +01:00
Pyritie
7c8d765768 do you like your bread with or without the peel 2025-08-15 00:50:20 +01:00
Pyritie
8d2a4d2473 oh yeah these still don't exist 2025-08-15 00:07:23 +01:00
Pyritie
b1f29a2ed0 added mineable tags to all crops, renamed file from crops to plants in prep for saplings 2025-08-14 22:12:48 +01:00
Pyritie
5cc07ffca1 added quest pointing people at the space survival chapter 2025-08-14 21:47:21 +01:00
Pyritie
f594b8a27e added gun quest to HV 2025-08-14 21:38:41 +01:00
Pyritie
3e11443023 locometal refactor #1624 2025-08-14 21:03:02 +01:00
Pyritie
ffcc45475e #1625 and #1623
Related Work Items: #16, #1625
2025-08-14 20:51:36 +01:00
Pyritie
fa9b9687ab fixed maple log centrifuge recipe to be the right kind of wood pulp 2025-08-14 20:38:00 +01:00
Pyritie
5ad5a6c892 buffed EGH sapling amount 2025-08-14 20:35:38 +01:00
Pyritie
f0466e53bd finally killed off all damascus steel recipes 2025-08-14 20:28:16 +01:00
Pyritie
8ee23fc3e1 fixes #1620 2025-08-14 09:08:48 +01:00
Pyritie
55a2d32aea langs 2025-08-13 23:19:31 +01:00
Pyritie
7ae68a1636 unification with pumpkin pie stuff 2025-08-13 23:17:33 +01:00
Pyritie
365fe1e5ca moved golden apples to the food processor 2025-08-13 23:08:01 +01:00
Pyritie
6bba775be0 mushroom and bamboo EGH recipes, also changed them all to the appropriate kind of water 2025-08-13 22:51:43 +01:00
Pyritie
8657cc38b1 fixed a dupe with certus quartz 2025-08-13 22:33:28 +01:00