Merge branch 'features-master' of github.com:S-B99/KAMI into features-master

This commit is contained in:
Bella 2019-12-04 09:52:25 -05:00
commit 5c8554dcca
2 changed files with 2 additions and 2 deletions

File diff suppressed because one or more lines are too long

View File

@ -6,7 +6,7 @@ import me.zeroeightsix.kami.setting.Setting;
import me.zeroeightsix.kami.setting.Settings;
// discord imports
import club.minnced.discord.rpc.*;
//import club.minnced.discord.rpc.*;
import com.google.common.hash.Hashing;
import net.minecraft.client.multiplayer.ServerData;
import net.minecraftforge.fml.common.FMLLog;