Merging changes from private branch

This commit is contained in:
Anuken 2025-04-04 11:47:35 -04:00
parent cf5c6d0905
commit b7dbe54d76
161 changed files with 2484 additions and 1137 deletions

View file

@ -41,6 +41,7 @@ task dist(type: Jar, dependsOn: configurations.runtimeClasspath){
exclude("fonts/**")
exclude("bundles/**")
exclude("cubemaps/**")
exclude("config/**")
exclude("cursors/**")
exclude("shaders/**")
exclude("icons/icon.icns")

View file

@ -1094,15 +1094,6 @@ public class ServerControl implements ApplicationListener{
}
}
/**
* @deprecated
* Use {@link Maps#setNextMapOverride(Map)} instead.
*/
@Deprecated
public void setNextMap(Map map){
maps.setNextMapOverride(map);
}
/**
* Cancels the world load timer task, if it is scheduled. Can be useful for stopping a server or hosting a new game.
*/