mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
Boiler work, added heat info tab, worked on polishing heat interactions among machines
This commit is contained in:
1 parent
9b9ed0a4c0
commit
87438dcc7f
396 files changed
+1014
-950
No files matched your search
@@ -288,19 +288,19 @@ public class CommonProxy implements IGuiProvider
|
||||
{
|
||||
if(s.trim().equalsIgnoreCase("j") || s.trim().equalsIgnoreCase("joules"))
|
||||
{
|
||||
general.activeType = EnergyType.J;
|
||||
general.energyUnit = EnergyType.J;
|
||||
}
|
||||
else if(s.trim().equalsIgnoreCase("rf") || s.trim().equalsIgnoreCase("te") || s.trim().equalsIgnoreCase("thermal expansion"))
|
||||
{
|
||||
general.activeType = EnergyType.RF;
|
||||
general.energyUnit = EnergyType.RF;
|
||||
}
|
||||
else if(s.trim().equalsIgnoreCase("eu") || s.trim().equalsIgnoreCase("ic2"))
|
||||
{
|
||||
general.activeType = EnergyType.EU;
|
||||
general.energyUnit = EnergyType.EU;
|
||||
}
|
||||
else if(s.trim().equalsIgnoreCase("mj") || s.trim().equalsIgnoreCase("bc") || s.trim().equalsIgnoreCase("buildcraft"))
|
||||
{
|
||||
general.activeType = EnergyType.MJ;
|
||||
general.energyUnit = EnergyType.MJ;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user