mirrors/Terra
1
0 Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-10-26 05:50:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into dev/repeat-script

Browse Source 
# Conflicts:
#	common/src/main/java/com/dfsek/terra/api/TerraPlugin.java
#	common/src/test/java/biome/DistributionTest.java
#	platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
#	platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java
#	platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraSpongePlugin.java
This commit is contained in:
dfsek committed 2021-05-09 15:20:57 -07:00
2 parents 92339c904d fd48f5f110
commit 8f9fc3e08f
191 files changed
+4588 -1581
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraSpongePlugin.java
+6
View File
@@ -15,6 +15,7 @@ import com.dfsek.terra.api.util.logging.DebugLogger;
import com.dfsek.terra.config.PluginConfig;
import com.dfsek.terra.config.lang.Language;
import com.dfsek.terra.config.pack.ConfigPack;
import com.dfsek.terra.profiler.Profiler;
import com.dfsek.terra.registry.master.AddonRegistry;
import com.dfsek.terra.registry.master.ConfigRegistry;
import com.dfsek.terra.sponge.world.SpongeWorldHandle;
@@ -144,4 +145,9 @@ public class TerraSpongePlugin implements TerraPlugin {
public TaskScheduler getScheduler() {
return null;
}
@Override
public Profiler getProfiler() {
return null;
}
}