536 Commits

Author SHA1 Message Date
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
Zoe Gidiere
a58b2a5193 Merge remote-tracking branch 'origin/dev/biome2' into ver/6.6.0 2024-10-12 14:40:33 -06:00
Zoe Gidiere
1ae0d1f867 WIP Caching Hints and Caching Sampler 2024-10-09 23:36:12 -06:00
Zoe Gidiere
197cb12be2 Update fabric versions to 1.21.2-pre1 2024-10-09 15:28:52 -06:00
Zoe Gidiere
a7a7354c40 remove 7.0 todo 2024-09-24 23:30:04 -06:00
Zoe Gidiere
42dcc9d9bd Merge remote-tracking branch 'origin/master' into dev/7.0-2 2024-09-24 23:29:52 -06:00
Zoe Gidiere
f70a83aec3 fix spawners on bukkit 2024-09-24 23:26:49 -06:00
Zoe Gidiere
581651e83b reformat 2024-09-24 10:06:57 -06:00
Zoe Gidiere
c95b3c09a8 Merge branch 'ver/6.5.0' into dev/7.0-2 2024-09-24 09:44:35 -06:00
Zoe Gidiere
f87b7c07d9 Reformat 2024-09-23 22:27:53 -06:00
Zoe Gidiere
f1124aae6b Update platform mod file versions and authors 2024-09-23 21:18:47 -06:00
Zoe Gidiere
d6772f51ea Reformat 2024-09-23 20:56:13 -06:00
Zoe Gidiere
ddb131d413 Merge remote-tracking branch 'origin/ver/6.5.0' into dev/7.0-2 2024-09-20 16:42:39 -06:00
Zoe Gidiere
b63f5f4a8f Reformat 2024-09-18 12:43:41 -06:00
Zoe Gidiere
5bc73dec37 Merge branch 'ver/6.5.0' into dev/7.0-2 2024-09-17 17:46:33 -06:00
Zoe Gidiere
664d1a3191 working 1.20.6 2024-09-17 16:34:30 -06:00
OakLoaf
3bef7d8572 Resolved errors when tab completing 2024-08-26 12:34:08 +01:00