552 Commits

Author SHA1 Message Date
Zoë Gidiere
16755fa049 Merge branch 'master' into dev/7.0-2 2025-06-18 11:20:58 -06:00
Zoë Gidiere
63367e5f03 Final changes 2025-06-17 18:41:09 -06:00
Zoë Gidiere
1d95e7a87d
Merge pull request #506 from benwoo1110/feat/multiverse-hook
Implement multiverse generator plugin hook
2025-06-17 16:23:19 -06:00
Zoë Gidiere
a25e3cd5a5 Merge branch 'master' into dev/7.0-2 2025-06-17 16:16:41 -06:00
Zoë Gidiere
4041239b03 fix build 2025-06-17 15:28:47 -06:00
Zoë Gidiere
280699bbce Update to 1.21.6 and fix a lot of bugs in fabric impl 2025-06-17 15:21:21 -06:00
Zoë Gidiere
bd253ea5d2 Merge branch 'master' into dev/1.21.6 2025-06-13 22:08:53 -06:00
OakLoaf
238a7954a7 Added paperweight to bukkit platform for runDevBundleServer task 2025-06-13 21:56:54 +01:00
Ben Woo
95172bfa7e Fix checkstyle for catch 2025-06-13 22:33:41 +08:00
Ben Woo
124dbc8836 Improve error checking for multiverse hook 2025-06-13 19:13:57 +08:00
OakLoaf
20a5bfdd0f Updated bukkit platform to 1.21.6 2025-06-10 11:44:10 +01:00
Ben Woo
4fee8cdb24 More example usages by iterating config pack 2025-06-10 12:06:24 +08:00
Ben Woo
70de38ffcb Fix exception variable name 2025-06-10 12:05:59 +08:00
Ben Woo
6722d22f72 Fix onarandombox repo url 2025-06-10 12:05:46 +08:00
Ben Woo
c5526c86a2 Implement multiverse plugin hook 2025-06-09 22:58:41 +08:00
HaHaWTH
bf6612edd0 Identify Moonrise worker threads correctly 2025-06-07 00:17:51 +14:00
Zoë Gidiere
118dc32d64 Merge branch 'master' into dev/7.0-2 2025-06-03 22:38:32 -06:00
Zoë Gidiere
b143c72d0e
Dev/1.21.5 (#495)
* Bukkit Build Fix (#494)

* Bukkit Build Fix

* remove comments

* remove papermc repo from gradle settings

* add back gradle shasum

* fix formatting, update gradle hash

* Initial Fabric 1.21.5

* Updated dependencies

* Updated SpawnerData with backwards compat

* Updated dependencies

* Updated setBlockState usage - needs verifying as flags are confusing

* Refactored Bukkit NMS packages

* Initial attempt at updating mixin-commons

* Continue fabric 1.21.5 WIP

* Some additional logging

* Update deps

* Build fixes and update allay

* Add oak to authors

---------

Co-authored-by: Mikal <Ifiht@users.noreply.github.com>
Co-authored-by: OakLoaf <oak@beaconstudios.org>
2025-06-03 22:20:23 -06:00
Zoë Gidiere
ef10081bcd Merge branch 'dev/7.0-2' into dev/seismic 2025-06-02 17:34:30 -06:00
Zoë Gidiere
dc8492a6cb Merge remote-tracking branch 'origin/dev/6.6.2' into dev/7.0-2 2025-06-02 17:34:18 -06:00
Mikal
52dc690243
Bukkit Build Fix (#494)
* Bukkit Build Fix

* remove comments

* remove papermc repo from gradle settings

* add back gradle shasum

* fix formatting, update gradle hash
2025-03-22 07:15:43 +00:00
Mirai
1b4824c5db
fix crash chunk generate column in generate chunk process
The change removes the subtraction of one from properties.getMinHeight(), fixing a crash on version 1.21.4.
2025-03-02 09:57:48 +02:00
Zoë Gidiere
5892464a1d WIP Seismic Integration 2025-03-01 21:32:39 -07:00
Zoë Gidiere
d2b7384639 Merge branch 'master' into dev/7.0-2 2025-03-01 14:36:04 -07:00
Zoë Gidiere
c36b12e657 Fix Vanilla Features Spawning in Terra Biomes 2025-03-01 10:48:42 -07:00
Zoë Gidiere
8ffb09db36 Merge branch 'master' into dev/7.0-2 2025-02-28 11:36:23 -07:00
OakLoaf
82a9ecf736 Fixed typo 2024-12-12 15:24:38 +00:00
OakLoaf
eec4db43b2 Added support for 1.21.4 2024-12-12 12:40:33 +00:00
OakLoaf
1d3c380784 Reverted to old methods grass and foliage color methods 2024-11-05 16:50:04 +00:00
OakLoaf
65e4c9a149 Removed comment 2024-11-01 19:46:34 +00:00
OakLoaf
d4549643fc The definition of AwfulBukkitHacks 2024-11-01 16:46:33 +00:00
OakLoaf
153f6e5a87 Recreated old reset tags method 2024-11-01 13:36:41 +00:00
OakLoaf
a385a43250 Moved registry unfreeze 2024-11-01 12:02:49 +00:00
OakLoaf
3cd6aead64 Changed biome registry casting 2024-11-01 12:02:32 +00:00
OakLoaf
4f33b11828 Fixed issue with RegistryFetcher 2024-11-01 12:02:09 +00:00
OakLoaf
f5bbaa3c3a Corrected class proxy 2024-11-01 11:57:35 +00:00
Zoe Gidiere
bd28d8170c Merge branch 'ver/6.6.0' into dev/7.0-2 2024-10-29 15:56:30 -06:00
Zoe Gidiere
710bbc33c9 Refractor bukkit to v1_21_3 2024-10-29 15:53:48 -06:00
Zoe Gidiere
3ca90808f0 Fix up 2024-10-29 14:23:45 -06:00
Zoe Gidiere
f98062d417 Merge remote-tracking branch 'origin/dev/bukkit/biome-settings' into dev/biomes3 2024-10-29 13:53:08 -06:00
OakLoaf
8df3a4dd02 Added NMSAddon override for BukkitAddon 2024-10-29 19:38:59 +00:00
OakLoaf
afd2c81b19 Made grass colour use default if none is defined 2024-10-29 18:31:37 +00:00
OakLoaf
8de4f1198a Started adding more biome settings to bukkit 2024-10-26 10:02:32 +01:00
Zoe Gidiere
d48b610b39 Merge remote-tracking branch 'origin/ver/6.6.0' into dev/7.0-2 2024-10-25 15:21:47 -06:00
OakLoaf
62756d2784 Updated Bukkit to support 1.21.3 2024-10-25 19:36:18 +01:00
Zoe Gidiere
32f8907cb1 Merge branch 'ver/6.6.0' into dev/1.21.2 2024-10-25 12:28:03 -06:00
Zoe Gidiere
053ec39b7b Merge branch 'master' into ver/6.6.0 2024-10-13 16:32:26 -06:00
Zoe Gidiere
12faae8fd5 Use reflection remapper for worldGenContext on bukkit
How this even worked before astounds me
2024-10-13 15:55:29 -06:00
Zoe Gidiere
cd2421bb49 Merge branch 'ver/6.6.0' into dev/7.0-2 2024-10-12 15:42:47 -06:00
Zoe Gidiere
16d8e8f29d Fix up merge 2024-10-12 14:49:53 -06:00