mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-20 23:30:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/ver/6.0.0' into architecture/slf4j-logging

Browse Source 
# Conflicts:
#	common/api/core/src/main/java/com/dfsek/terra/api/Logger.java
This commit is contained in:
solonovamax
2021-09-24 13:50:21 -04:00
parent b6c40302b6 0a6cde69d6
commit b03c8b4a11
271 changed files with 123 additions and 3977 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraSpongePlugin.java
View File

@@ -3,7 +3,7 @@ package com.dfsek.terra.sponge;
import com.google.inject.Inject;
import org.spongepowered.api.Game;
import org.spongepowered.plugin.PluginContainer;
import org.spongepowered.plugin.jvm.Plugin;
import org.spongepowered.plugin.builtin.jvm.Plugin;
@Plugin("terra")