mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-21 12:42:36 +00:00
Merge remote-tracking branch 'Zoko/release/1.7.10/2.3' into 1.12-stuff
# Conflicts: # .gitignore # gradle.properties # src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java
This commit is contained in:
commit
dfd194159f
4 files changed
+10
-7
No files matched your search
@@ -38,3 +38,4 @@
|
||||
resources/assets/enderio/lang/*.lang.txt
|
||||
*.bat
|
||||
libs/
|
||||
options.txt
|
||||
@@ -1,8 +1,10 @@
|
||||
EnderIO [](http://ci.tterrag.com/job/EnderIO/)
|
||||
EnderIO-Unofficial
|
||||
=======
|
||||
|
||||
This is a unofficial version of EndeIO for 1.7.10, in case of any bugs or problems please do not contact the original developers of EnderIO!
|
||||
|
||||
All code (excluding the bundled APIs from other mods, which are covered by their respective licenses) are released without restriction into the public domain under the CC0 1.0 license (http://creativecommons.org/publicdomain/zero/1.0/legalcode) FAQ (https://wiki.creativecommons.org/CC0_FAQ).
|
||||
Do what you want with it, as long as you smile while doing so. While it is not a requirement, it would be nice to know if it is being used and how, so send me hello to **crazypants.mc at gmail.com**.
|
||||
Do what you want with it, as long as you smile while doing so.
|
||||
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -2,7 +2,7 @@ minecraft_version=1.7.10
|
||||
forge_version=10.13.4.1614-1.7.10
|
||||
forgeDep_version=10.13.4.1614
|
||||
|
||||
mod_version=2.3.1.9_beta
|
||||
mod_version=2.3.2.0_beta
|
||||
|
||||
#Comment out this line to get rid of the appendix
|
||||
#mod_appendix=beta
|
||||
@@ -19,4 +19,4 @@ opencomputers_version=MC1.7.10-1.5.+
|
||||
|
||||
toReplace=after:endercore;after:MineFactoryReloaded;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv3-beta-24,)
|
||||
|
||||
curse_projectId=64578
|
||||
curse_projectId=379275
|
||||
@@ -32,15 +32,15 @@ import crazypants.enderio.xp.XpUtil;
|
||||
public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveExperience, IFluidHandler, ITankAccess {
|
||||
|
||||
public static final int POWER_PER_TICK_ONE = Config.soulBinderLevelOnePowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_ONE = new BasicCapacitor(POWER_PER_TICK_ONE * 2,
|
||||
private static final BasicCapacitor CAP_ONE = new BasicCapacitor(0,POWER_PER_TICK_ONE * 2,
|
||||
Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_ONE);
|
||||
|
||||
public static final int POWER_PER_TICK_TWO = Config.soulBinderLevelTwoPowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_TWO = new BasicCapacitor(POWER_PER_TICK_TWO * 2,
|
||||
private static final BasicCapacitor CAP_TWO = new BasicCapacitor(0,POWER_PER_TICK_TWO * 2,
|
||||
Capacitors.ACTIVATED_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_TWO);
|
||||
|
||||
public static final int POWER_PER_TICK_THREE = Config.soulBinderLevelThreePowerPerTickRF;
|
||||
private static final BasicCapacitor CAP_THREE = new BasicCapacitor(POWER_PER_TICK_THREE * 2,
|
||||
private static final BasicCapacitor CAP_THREE = new BasicCapacitor(0,POWER_PER_TICK_THREE * 2,
|
||||
Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_THREE);
|
||||
|
||||
private final ExperienceContainer xpCont = new ExperienceContainer(XpUtil.getExperienceForLevel(Config.soulBinderMaxXpLevel));
|
||||
|
||||
Reference in new issue
Block a user