Merge branch 'master' into 1.16

This commit is contained in:
gnembon committed 2020-07-13 00:41:34 -03:00
commit 0e21942df7
13 files changed
+623 -556

No files matched your search

+1 -1
View File
@@ -11,7 +11,7 @@ import carpet.helpers.TickSpeed;
import carpet.logging.LoggerRegistry;
import carpet.script.CarpetScriptServer;
import carpet.settings.SettingsManager;
import carpet.utils.HUDController;
import carpet.logging.HUDController;
import carpet.utils.MobAI;
import carpet.utils.SpawnReporter;
import com.mojang.brigadier.CommandDispatcher;