Commit Graph
3587 Commits
Author SHA1 Message Date
Martin Robertz 517c2ced37 Merge branch 'master' into dev 1.14.44-GTNH-pre 2026-03-22 15:30:06 +01:00
DarkShadow44 c47a891471 Don't allow smelting rails in GTNH (#266) 1.14.43-GTNH 2026-03-20 18:56:10 +01:00
Martin Robertz 1bbd82507c Merge remote-tracking branch 'origin/master' into dev 1.14.42-GTNH-pre 2026-03-20 08:09:51 +01:00
514ca6a61e Bugfix for another pull request. (#260)
Co-authored-by: Martin Robertz <[email protected]>
Co-authored-by: Ruling-0 <[email protected]>
1.14.41-GTNH
2026-03-19 19:42:59 -05:00
Martin Robertz 4383de8399 Merge remote-tracking branch 'ChromaPIE/dumpbutton' into dev 1.14.40-GTNH-pre 2026-03-19 20:22:49 +01:00
Martin Robertz 14ec1e8c11 Merge branch 'master' into dev 2026-03-19 20:22:45 +01:00
Martin Robertz 51f4f75378 update 1.14.39-GTNH 2026-03-19 20:19:50 +01:00
f5f145bb5c part chest / add pattern chest for stencil table / fix manual render postition (#258)
Co-authored-by: Martin Robertz <[email protected]>
Co-authored-by: zyf051520 <[email protected]>
Co-authored-by: Caedis <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: iouter <[email protected]>
2026-03-19 16:24:06 +01:00
ChromaPIE ff35af1f98 resolve 2026-03-17 11:21:57 +08:00
Martin Robertz fc90cf8841 Merge branch 'master' into dumpbutton 2026-03-15 13:17:12 +01:00
Martin Robertz d31fa30010 Merge branch 'master' into dev 1.14.38-GTNH-pre 2026-03-14 11:10:55 +01:00
LazyFleshWasTaken c5c4a330a1 AOE Tool harvest config + AOE Break logic enchancement (#257) 1.14.37-GTNH 2026-03-14 04:06:49 -04:00
Martin Robertz 5b64f7ad89 Merge branch 'master' into dumpbutton 2026-03-11 21:36:22 +01:00
Martin Robertz cfc4133a8d update 1.14.36-GTNH-pre 2026-03-11 15:29:06 +01:00
Martin Robertz b5022ec71e Merge remote-tracking branch 'ChromaPIE/dumpbutton' into dev 2026-03-11 15:26:11 +01:00
Martin Robertz 09b913f71e Merge remote-tracking branch 'imTheSupremeOne/master' into dev 2026-03-11 15:26:05 +01:00
Martin Robertz cf613c91e0 Merge remote-tracking branch 'ohentis/lumber-axe-fix' into dev 2026-03-11 15:25:52 +01:00
Martin Robertz 687e5e61cb Merge remote-tracking branch 'origin/essenceBerryTweaks' into dev 2026-03-11 15:25:43 +01:00
Martin Robertz f1e3eea215 update+gradle+bs+deps 1.14.35-GTNH 2026-03-10 19:34:20 +01:00
Ranzu 632ae76efb abomination to excitation (#263) 2026-03-10 19:31:13 +01:00
Martin Robertz 6967791a07 Merge branch 'master' into dumpbutton 2026-03-08 10:43:22 +01:00
Pierre Zhang 2ee843c79c improve things 2026-03-08 15:51:06 +08:00
UltraProdigy dc0f2b891b Optimize Image & Workflow (#261) 1.14.34-GTNH 2026-03-07 11:32:49 +01:00
Martin Robertz 849959b376 Merge branch 'master' into essenceBerryTweaks 2026-03-03 07:44:16 +01:00
Martin Robertz 6c6ffe4fa0 Merge branch 'master' into lumber-axe-fix 2026-03-03 07:43:47 +01:00
Martin Robertz 8cfea2d8c0 Merge branch 'master' into dumpbutton 2026-03-03 07:42:08 +01:00
Martin Robertz 9cdaf0f5ae Merge branch 'master' into master 2026-03-03 07:41:57 +01:00
RanzuandUltraProdigy 848ba01de4 Added optional Nei color localization (#254)
Co-authored-by: UltraProdigy <[email protected]>
1.14.32-GTNH
2026-03-03 03:36:43 +00:00
Ranzu 4f59ed6ea0 Fixes Inventory Tab Pixels (#259) 2026-03-02 15:50:23 +01:00
Martin Robertz f7ccad5c37 Merge branch 'master' into essenceBerryTweaks 2026-02-18 18:42:10 +01:00
MCTBL f3111fed19 fix the shift left click transfer function in Stencil Table (#255) 1.14.30-GTNH 2026-02-18 17:36:15 +01:00
EnderProyects 823f1b23ca Merge branch 'master' into lumber-axe-fix 2026-02-11 13:55:19 +01:00
Ruling-0 6e69a61ed6 Merge branch 'master' into dumpbutton 2026-02-05 21:48:33 -06:00
Nikolay S. 345965f4d0 Don't use a regex in Tool Station (#253) 1.14.27-GTNH 2026-02-04 02:27:11 +00:00
1755470299 Fix tool forge voiding items bug/desync (#244)
Co-authored-by: Martin Robertz <[email protected]>
Co-authored-by: Nikolay S. <[email protected]>
2026-02-03 20:24:18 -06:00
PLASMAchicken a59ee11285 Implement null check in drawToolStats (#251) 2026-02-03 18:47:56 +00:00
Martin Robertz 0fd88d3866 Merge branch 'master' into master 2026-02-03 15:19:11 +01:00
Nikolay S. 03968731d9 Clean up Tool Station GUI code (#249) 2026-02-03 15:17:41 +01:00
imTheSupremeOne 56221da604 fixed quartz modifier not adding attack due to overflow 2026-02-03 13:37:57 +02:00
Martin Robertz 79284a6588 backdate Angelica 2026-01-30 12:09:18 +01:00
Martin Robertz c336351195 update 2026-01-30 11:42:37 +01:00
Moe c521bd44d2 Remove the broken flag on tools when adding a durability modifier to a broken tool (#245) 1.14.24-GTNH 2026-01-25 08:37:06 +00:00
Caedis ab057744ba Fix JourneyMap waypoint label flickering when on armor tab (#247) 1.14.22-GTNH 2026-01-20 21:43:30 +01:00
ohentisandMartin Robertz bcf7458b9a Various Slime Fixes (#243)
Co-authored-by: Martin Robertz <[email protected]>
1.14.20-GTNH
2026-01-12 03:34:43 +01:00
boubou19 90fc75c218 Merge branch 'master' into essenceBerryTweaks 2025-12-16 20:34:20 +01:00
DarkShadow44andboubou19 23125422c9 Sync changes to ammo in baubles inventory (#236)
Co-authored-by: boubou19 <[email protected]>
1.14.17-GTNH
2025-12-16 19:07:57 +00:00
SuperSoupr e078228eb8 Fix 3rd person translucency bug (#237) 2025-12-15 00:39:25 +01:00
Alexdoru 42c27d7cd9 delete unused event registration (#235) 1.14.15-GTNH 2025-12-11 06:57:36 +01:00
SuperSouprandFourIsTheNumber 950fde4c7b Add support for translucent tools and parts (#232)
Co-authored-by: FourIsTheNumber <[email protected]>
1.14.14-GTNH
2025-12-02 11:36:07 -05:00
Alexdoru 41a2e67900 avoid creation of empty NBT tags in WeaponryHandler#boneanaBuilding (#233) 2025-12-01 19:05:14 +01:00