mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-10-11 19:14:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,800 Commits 93 Branches 16 Tags
a25e3cd5a5a626051d3442e7d6b2ef20efaa2568
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Zoë Gidiere a25e3cd5a5 Merge branch 'master' into dev/7.0-2 2025-06-17 16:16:41 -06:00
Zoë Gidiere b2e21d8b70 Merge pull request #508 from PolyhedralDev/dev/1.21.6 
Dev/1.21.6
 2025-06-17 15:34:38 -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 c4dfdafce8 Merge pull request #507 from everbuild-org/dev/7.0-2 
Update Minestom to latest version
 2025-06-16 20:02:42 -06:00
Zoë Gidiere 6984dc29d0 Fix fabric 2025-06-14 00:45:32 -06:00
Zoë Gidiere bd253ea5d2 Merge branch 'master' into dev/1.21.6 2025-06-13 22:08:53 -06:00
Zoë Gidiere 8706340584 Fix wolves 2025-06-12 16:25:14 -06:00
Zoë Gidiere 84fa72f96c Catch all runtime errors when loading packs 2025-06-07 22:14:36 -06:00
Zoë Gidiere cc5258ce73 bump version 2025-06-07 21:12:26 -06:00
Zoë Gidiere 748e027282 Merge pull request #505 from HaHaWTH/master 
Identify Moonrise worker threads correctly
 2025-06-07 07:18:45 +00:00
Zoë Gidiere 4eace9e7fb Merge remote-tracking branch 'origin/master' into dev/7.0-2 2025-06-05 21:03:58 -06:00
Zoë Gidiere d90a4200fe Update gradle-build.yml 2025-06-05 19:19:43 -06:00
Zoë Gidiere 39ae1fdf93 Merge branch 'master' into dev/7.0-2 2025-06-05 17:51:01 -06:00
Zoë Gidiere af9fb211a8 bump fabric minecraft dep 2025-06-05 17:50:44 -06:00
Zoë Gidiere e9d1add6af Merge branch 'master' into dev/7.0-2 2025-06-05 17:21:00 -06:00
Zoë Gidiere e4395cec83 bump version 2025-06-05 17:18:55 -06:00
Zoë Gidiere 1881051191 Merge pull request #504 from everbuild-org/dev/7.0-2 
Apply biomes to minestom instances
 2025-06-05 08:16:00 +00:00
Zoë Gidiere 4450a56ef0 Merge branch 'dev/7.0-2' into dev/7.0-2 2025-06-05 05:38:32 +00:00
Zoë Gidiere bab8923f1e update overworld version 2025-06-04 00:21:14 -06:00
Zoë Gidiere 28d93d158e fix up 2025-06-03 22:52:26 -06:00
Zoë Gidiere 118dc32d64 Merge branch 'master' into dev/7.0-2 2025-06-03 22:38:32 -06:00
Zoë Gidiere b4068e6c59 Merge branch 'dev/1.21.5' 2025-06-03 22:28:48 -06:00
Zoë GidiereMikalOakLoaf
 		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 5f5e70970b Add oak to authors 2025-06-03 21:40:14 -06:00
Zoë Gidiere ec812ef5fb Build fixes and update allay 2025-06-03 21:33:56 -06:00
Zoë Gidiere 85826071cb Update deps 2025-06-03 20:25:55 -06:00
Zoë Gidiere c4f093210a Some additional logging 2025-06-03 15:15:07 -06:00
Zoë Gidiere f14d22b264 Continue fabric 1.21.5 WIP 2025-06-03 13:59:11 -06:00
Zoë Gidiere bdd80d7832 Merge branch 'dev/seismic' into dev/7.0-2 2025-06-03 04:37:11 -06:00
Zoë Gidiere adfdb8d63c update versions 2025-06-03 04:37:03 -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
Zoë Gidiere d3df5e56c3 Initial Fabric 1.21.5 2025-03-25 16:26:43 -06:00
Zoë Gidiere 4bef2f5a7f Merge pull request #491 from PolyhedralDev/duplexsystem-patch-1 
Update Mapping.java
 2025-03-06 21:45:41 +00:00
Zoë Gidiere 18cb08b622 Update Mapping.java 2025-03-06 21:45:23 +00:00
Zoë Gidiere 1b15694878 Merge pull request #490 from AllayMC/dev/allay-api-0.2.0 
feat: adapt allay-api 0.2.0
 2025-03-06 21:32:44 +00:00
Zoë Gidiere 83bc2c9022 Bump Version 2025-03-02 06:42:12 -07:00
Zoë Gidiere 06a60b3db4 Merge pull request #489 from RitaSister/patch-1 
fix crash chunk generate column in generate chunk process
 2025-03-02 06:41:41 -07:00
Zoë Gidiere 5892464a1d WIP Seismic Integration 2025-03-01 21:32:39 -07:00
Zoë Gidiere 8366a5288b fix minestom build 2025-03-01 15:45:30 -07:00
Zoë Gidiere d2b7384639 Merge branch 'master' into dev/7.0-2 2025-03-01 14:36:04 -07:00
Zoë Gidiere 49c6e70037 try catch downloading packs for offline usage 2025-03-01 10:48:58 -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
Zoë Gidiere 9906771fbc Merge pull request #472 from PolyhedralDev/ver/6.6.0 
Ver/6.6.0
 2025-02-28 04:31:06 +00:00
Zoe Gidiere e0a26046a0 Update Fabric version info 2025-02-27 19:51:18 -07:00
Zoe Gidiere 8bad33ef22 fabric 1.21.4 2025-02-27 19:33:51 -07:00
Zoë Gidiere f278ae7ab5 update licence 2025-02-26 22:34:41 -07:00
Zoë Gidiere a61c6b8a97 Merge remote-tracking branch 'everbuild-org/feat/platform/minestom' into ver/6.6.0 2025-02-26 10:22:37 -07:00
Zoë Gidiere 830ede9272 Merge pull request #484 from AllayMC/dev/allay-update 
fix: adapt allay update
 2025-02-26 10:20:43 -07:00
Zoë Gidiere 8e544a68d4 Merge pull request #483 from PolyhedralDev/dev/1.21.4 
Add support for 1.21.4 on Paper
 2025-02-26 10:20:25 -07:00
Zoe Gidiere 4fd84a3f2d Fix paralithic relocating 2024-10-31 13:42:41 -06:00
Zoë Gidiere bed67c211d Merge pull request #478 from PolyhedralDev/dev/let-expression 
Add let expression support
 2024-10-30 18:51:05 +00:00
Zoe Gidiere ecbca608a5 Merge branch 'ver/6.6.0' into dev/7.0-2 2024-10-29 20:24:38 -06:00
Zoe Gidiere 02fdcee705 Fix fabric 2024-10-29 20:24:32 -06:00
Zoe Gidiere b4ab88a02e Fix allay reload 2024-10-29 16:13:29 -06:00
Zoe Gidiere ef1c9c125f Merge branch 'ver/6.6.0' into dev/7.0-2 2024-10-29 16:05:01 -06:00
Zoe Gidiere 4165224c51 Mark Cache Sampler Experimental 2024-10-29 16:04:55 -06:00
Zoe Gidiere e665e187c1 Fix up merge 2024-10-29 16:00:39 -06: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
Zoë Gidiere 1929239015 Merge pull request #473 from PolyhedralDev/dev/biomes3 
Some refractors and updates to platofrm biomes
 2024-10-29 20:27:42 +00:00
Zoe Gidiere 3ca90808f0 Fix up 2024-10-29 14:23:45 -06:00
Zoe Gidiere 9d91440997 fixup 2024-10-29 14:14:25 -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
Zoë Gidiere 4432ae4867 Merge pull request #476 from AllayMC/dev/support-world-unload 
feat: support world unloading
 2024-10-28 18:18:23 +00:00
Zoe Gidiere d91e531fa5 fix allay 2024-10-25 16:28:00 -06:00
Zoe Gidiere 2a40f4af1e Merge branch 'ver/6.6.0' into dev/7.0-2 2024-10-25 16:14:54 -06:00
Zoe Gidiere 144c932703 mixin tweak 2024-10-25 16:09:42 -06:00
Zoë Gidiere e56b8856fa Merge pull request #474 from AllayMC/allay 
feat: add support for allay platform
 2024-10-25 16:05:58 -06:00
Zoe Gidiere d088d2f5a8 InlineVar 2024-10-25 15:59:38 -06:00
Zoe Gidiere 3d66386f99 Populate packs in a metapack under extended 2024-10-25 15:58:15 -06:00
Zoe Gidiere 1912d8e34c Fixup 2024-10-25 15:44:51 -06: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
Zoë Gidiere 04f6d18198 Merge pull request #470 from PolyhedralDev/dev/1.21.2 
Dev/1.21.2
 2024-10-25 14:09:16 -06:00
Zoe Gidiere 640645b96b fix version 2024-10-25 14:03:27 -06:00
Zoe Gidiere a70738eda5 Version updates 2024-10-25 13:58:33 -06: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 0a952cff4c bump build number 2024-10-13 16:06:35 -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 40a938be19 Merge branch 'ver/6.6.0' into dev/biomes3 2024-10-12 15:44:19 -06:00
Zoe Gidiere dc6cfb4187 Merge branch 'ver/6.6.0' into dev/7.0-2 2024-10-12 15:43:58 -06:00
Zoe Gidiere 4be2390294 Small cache fix 2024-10-12 15:43:23 -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 da16f65ea2 Merge branch 'ver/6.6.0' into dev/biomes3 2024-10-12 15:39:03 -06:00
Zoe Gidiere 65d026a130 Fix Cache Deadlock 2024-10-12 15:38:51 -06:00
Zoe Gidiere d45256b2f7 Another merge fixup 2024-10-12 14:52:11 -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 1e5a1e20c2 Merge remote-tracking branch 'origin/master' into ver/6.6.0 2024-10-12 14:29:42 -06:00
Zoë Gidiere 592788450c Update CODEOWNERS 2024-10-12 13:45:55 -06:00
Zoë Gidiere 060cbfd0c4 Update CODEOWNERS 2024-10-12 13:44:02 -06:00
Zoe Gidiere b9c2f4e63b Update Licence year 2024-10-12 02:03:43 -06:00
Zoe Gidiere 87674aa0ba fix cellular sampler 2024-10-12 02:02:28 -06:00
Zoe Gidiere 40ccf80c7f Optimization when Terra Profiler is not running 
Do not set Profiler SAFE Threadlocal var when profiler is not running but ensure it is set to false after the profiler stops to ensure consistent behavior
 2024-10-12 00:58:08 -06:00
Zoe Gidiere 6946755e31 Minor Cellular opt 2024-10-12 00:56:37 -06:00
Zoë Gidiere 3b9962662e Merge pull request #471 from PolyhedralDev/dev/caching 
Dev/caching
 2024-10-12 00:22:43 -06:00
Zoe Gidiere 7ca61f82b2 Some API clean up 2024-10-12 00:22:18 -06:00