Commit Graph
240 Commits
Author SHA1 Message Date
UltraProdigy b5b1b577bf ci: run build and test on release branches 2026-11-09 02:38:18 -05:00
Pedro Ortiz Bledow a58cd9318c Handle tooltip for "universal" type baubles correctly (#25) 2.1.19-GTNH 2025-12-17 22:24:57 +01:00
Pedro Ortiz Bledow 34d6480d23 Sync #22 to release/2.8.x (#23) 2.1.18-GTNH 2025-12-06 15:44:20 +01:00
Worive e19e38eec9 Fix double call to mergeItemStack (#19)
(cherry picked from commit 17cdf9cb99)
2.1.17-GTNH
2025-10-19 21:43:06 +02:00
Ethryan aecb3cb093 fix conflict 2.1.16-GTNH 2025-10-18 14:27:52 +02:00
DarkShadow44 c0d1859b61 After clearing, get new baubles inventory instead of working with old one (#15)
(cherry picked from commit 4d4fc3a2ae)
2025-10-18 14:25:42 +02:00
Martin Robertz ec5a92a4ad update 2.1.15-GTNH 2025-09-20 16:09:31 +02:00
DarkShadow44 fc27584c13 Fix baubles not being applied on login (#14) 2025-09-19 06:56:27 +02:00
Martin Robertz 0efe4d7541 Update build-and-test.yml 2025-09-15 21:06:11 +02:00
Martin Robertz 28d70a2a11 update 2025-09-15 20:51:16 +02:00
koolkrafter5 b57a7a1dd6 New Curios-Inspired GUI (#13) 2.1.14-GTNH 2025-09-14 20:35:31 +02:00
Dream Master 63833f2fbb update 2.1.13-GTNH 2025-08-03 22:50:55 +07:00
Dream Master e51d629bd6 Merge remote-tracking branch 'origin/HEAD' into gtnh 2025-08-03 22:49:35 +07:00
Martin Robertz 0af0c260c4 Merge branch 'jss2a98aj:1.7.10' into 1.7.10 2025-08-03 22:31:32 +07:00
Alexdoru d1cd6ebbc1 Improve Thaumcrap's deploader neutralization (#12) 2025-08-01 15:36:22 -07:00
RubilaxXxx 0c8e5587b7 fix curseforge project id (#10) 2025-07-24 22:01:54 +07:00
Martin Robertz c73bbba174 Merge remote-tracking branch 'origin/1.7.10' into gtnh 2.1.9-GTNH 2025-06-14 00:31:38 +02:00
Alexdoru eca345b747 unbind keybind by default (#9) 2025-06-12 19:02:14 +02:00
jss2a98aj fdc077ea64 Update README.md 2025-05-29 17:18:06 -04:00
jss2a98aj 8d721ede00 Universal slot texture and localization string 2025-05-29 16:48:56 -04:00
jss2a98aj f5910607f2 Merge pull request #17 from FalsePattern/1.7.10
Fix off-by-one error in slot unassignment logic
2025-05-29 11:47:17 -04:00
FalsePattern 43002e4d5a fix off-by-one error in slot unassignment logic 2025-05-29 16:26:56 +02:00
jss2a98aj 9ab489d3a1 Reduce gradle version to avoid build issue 2025-05-28 16:52:36 -04:00
Jason Mitchell ea2485b2ed Add CF Project ID (#7) 2025-05-22 00:06:47 -04:00
Martin Robertz 691ee7be96 Merge remote-tracking branch 'origin/1.7.10' into gtnh 2.1.8-GTNH 2025-05-20 20:36:24 +02:00
jss2a98aj deeaec99fe Merge pull request #14 from GTNewHorizons/fixBaubleSyncing
Fix client baubles not all being synced
2025-05-20 14:16:19 -04:00
Caedis bd227ba047 Fix client baubles not all being synced 2025-05-20 12:48:57 -05:00
Martin Robertz 31b3568de3 update 2.1.7-GTNH 2025-05-04 13:32:00 +02:00
jss2a98aj ac75ed2328 Merge pull request #10 from GTNewHorizons/fix-coremod
Add `mcmod.info`, fix coremod manifest path
2025-05-03 16:02:53 -04:00
glowredman c68dc1dfc0 Add back dummy DepLoader with fixed manifest 2025-05-03 18:00:02 +02:00
glowredman 691d0c1a7f Update buildscript 2025-05-03 17:59:23 +02:00
jss2a98aj 1631873af3 Merge pull request #12 from Omgise/1.7.10
Update zh_CN.lang
2025-03-09 23:11:23 -05:00
Omgise e74aa2d23f Update zh_CN.lang
Again fix chinese translation errors
2025-03-09 22:33:25 +08:00
jss2a98aj 959261bdb1 Merge pull request #11 from Omgise/1.7.10
Update zh_CN.lang
2025-03-09 09:28:20 -05:00
Omgise 8a592fa049 Update zh_CN.lang 2025-03-09 20:25:01 +08:00
glowredman 970bb768dd Add mcmod.info 2025-03-01 11:17:34 +01:00
glowredman 600155a13d Remove DepLoader 2025-03-01 11:17:17 +01:00
jss2a98aj e589567c34 Merge pull request #9 from GTNewHorizons/1.7.10-sync
Sync from GTNH fork
2025-02-23 15:55:03 -06:00
Caedis fbf017a903 Delete CODEOWNERS 2025-02-23 04:40:32 -06:00
Caedis 4a0cd50ebf update bs 2.1.5-GTNH 2025-02-23 02:40:47 -06:00
Martin Robertz 8de2fcf48d update 2024-10-02 15:17:02 +02:00
Alexdoru 54b672c618 fix BaubleType.UNIVERSAL not working (#6) 2.0.3 2024-10-01 21:05:57 +02:00
Caedis 46abac47c5 Update gradle.properties (#5)
Need to prevent thaumcraft's shadowed CCC deploader from executing
2024-08-29 18:28:24 +02:00
Caedis da7ab092c8 Add Universal Bauble Type (can go into any slot) (#4)
* Add Universal Bauble Type (can go into any slot)

* remove space
2.0.2
2024-08-28 23:42:40 -05:00
Martin Robertz 624c8a74a5 update 2024-08-18 15:11:23 +02:00
Caedis 4f4741d21e Refactor bauble methods into abstract class (#3)
* Refactor some bauble methods into an abstract class

* This was needed to stop TC4 from deploading the OG version

* remove unneeded clientonly

* Add note
2.0.1
2024-08-07 15:34:52 -05:00
Caedis 8afc29f5ab update BS (#2) 2.0.0 2024-08-07 14:54:01 +02:00
Raven Szewczyk 6e97f080ff [ci skip] upgraded build system 2024-02-04 19:56:46 +00:00
Alastors c1ed3a9e06 Create CODEOWNERS (#1) 2023-12-14 17:07:14 -08:00
Alastors 059e3c31d7 update BS 2023-12-14 19:30:10 -05:00