Commit Graph
14 Commits
Author SHA1 Message Date
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
mezz 344e842764 Fix some mail glitches. Check valid addresses for writing letters 2014-12-14 18:07:57 -08:00
CovertJaguar 3636af5b9c More work on inventory stuff, and fix all the broken merge stuff 2014-11-30 17:59:31 -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 3884fecf77 Minor Cleanup
Fix up some null checks

Clean up redundant array creation to varargs parameter

Remove redundant type casts

Simplify arithmetic

Use foreach loops

Remove unused code

Minor cleanup
2014-11-29 23:49:47 -08:00
mezz f13bacfed5 Remove EnumAddressee.INVALID 2014-09-13 19:30:21 -07:00
mezz dff81eb85c Use EnumAddressee instead of String to identify mail carriers 2014-09-12 21:26:33 -07:00
mezz 36da6efa91 Fix-up of the Mail system
Fixed several crashes and bugs. Tested by sending mail and trading with multiple real accounts and a server.
closes #176
2014-09-10 03:55:32 -07:00
James Mitchell d05dbd7f94 Make sure post offices are saved and loaded properly.
Fixes #141
2014-09-02 19:15:33 -07:00
SandGrainOne 3c841b3ce0 Fixing persistence of the PostOffice
Fixes #136
2014-08-20 23:32:22 +02:00
James Mitchell 91713c8fb8 Cleaned up use of MailAddress 2014-08-18 22:37:05 -07:00
SandGrainOne 07b98ad150 Fixes to trade system 2014-08-13 00:32:23 +02:00
JamesMitchell ec05cdc2c1 fixes for mail system. 2014-08-11 14:35:12 -07: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