CovertJaguar
c7d88d73d3
Clean imports
2014-12-15 08:15:21 -08:00
CovertJaguar
db93c6e930
Merge branch 'dev' into inventory-cleanup
...
Conflicts:
src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java
src/main/java/forestry/core/circuits/ItemSolderingIron.java
src/main/java/forestry/core/gadgets/TileAnalyzer.java
src/main/java/forestry/energy/gadgets/EngineBronze.java
src/main/java/forestry/energy/gadgets/MachineGenerator.java
src/main/java/forestry/factory/gadgets/MachineBottler.java
src/main/java/forestry/factory/gadgets/MachineCarpenter.java
src/main/java/forestry/factory/gadgets/MachineFabricator.java
src/main/java/forestry/factory/gadgets/MachineMoistener.java
src/main/java/forestry/factory/gadgets/MachineRaintank.java
src/main/java/forestry/factory/gadgets/MachineSqueezer.java
src/main/java/forestry/factory/gadgets/MachineStill.java
src/main/java/forestry/mail/gadgets/MachineTrader.java
2014-12-15 07:56:29 -08:00
CovertJaguar
ccdcce47cc
Fixes #369 The Solding Iron and other Cicruit stuff should no longer crash if no layouts are defined.
...
The fix kind of grew out of control because I had to add a new EnumErrorCode and didn't want to keep breaking the API every time I did that. So I needed to decouple the ErrorStates from EnumErrorCode.
2014-12-15 07:45:10 -08:00
CovertJaguar
034cdf2860
Intial stages of an cleanup of the inventory code, this commit is very broken.
2014-11-30 17:19:16 -08:00
mezz
b6ba59f9f9
Move EnumErrorCode to the API (tick performance)
2014-11-16 20:01:33 -08:00
Vexatos
c2bc3a3d01
Fixed chat messages
2014-08-19 14:59:47 +02:00
Parker
8f2d802f11
Reformed Forestry!
...
* Updated for BC 6.0.x compatibility
* Re-implemented the Pipes plugin
* Converted to vanilla assets lang system
* Converted to standard gradle file structure
* General warnings cleanup
2014-08-11 16:56:09 -04:00