Commit graph

756 commits

Author SHA1 Message Date
AlgorithmX2
9b8596dc7c Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-26 10:59:03 -05:00
AlgorithmX2
3ac94550e5 Seeds can now be planted via Formation Planes. 2014-05-26 10:58:41 -05:00
AlgorithmX2
161f88e42c Added Paint Balls.
Added Color Applicator.
2014-05-26 03:26:37 -05:00
AlgorithmX2
82ac1eb2e7 Add support for Mouse Wheel Event passing to Items. the clean way. 2014-05-26 03:25:17 -05:00
AlgorithmX2
425f144f25 And again! 2014-05-25 20:59:15 -05:00
AlgorithmX2
2f59aa2228 Port Update from rv0 2014-05-25 20:59:04 -05:00
AlgorithmX2
905832ae85 Renamed ExtraTextures and added ExtraItemTextures. 2014-05-25 20:58:44 -05:00
AlgorithmX2
ef7a1592e7 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-25 18:35:44 -05:00
AlgorithmX2
6b0fa0f142 Clear Memory Card When Shift Clicking on a non-machine / air.
Fixed Tooltip to properly localize names.
2014-05-25 18:32:16 -05:00
AlgorithmX2
cbc2486161 Copy Item Stack before manipulating DSU. 2014-05-25 17:43:42 -05:00
AlgorithmX2
fa376237fd remove unused variable, and added lumen cable. 2014-05-25 17:43:17 -05:00
AlgorithmX2
7b33635c47 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-25 11:07:18 -05:00
AlgorithmX2
4cf6f4e5f9 Don't Show Energy Cell info if the NBT Came from the client. 2014-05-25 11:06:59 -05:00
AlgorithmX2
bd7b154455 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-25 00:03:27 -05:00
AlgorithmX2
8f474b8baf Fixed http://openeye.openmods.info/crashes/e9ee0132c58b39e5d6b41983e239b77f
Fixed http://openeye.openmods.info/crashes/90d72b392a1e968ef7dab98f5a65d1d8
2014-05-24 23:55:13 -05:00
AlgorithmX2
baefedc4b8 ME Chest can have its drive removed via automation via the front slot. 2014-05-24 23:49:24 -05:00
AlgorithmX2
a861f09b01 ME Chest insertion behavior fixed.
ME Chest drive slot now properly accessible from front drive face.
ME Chests can now function as tanks. ( fluid cells from extra cells )
ME Chests now return an empty slot list when they have no storage cells ( thus disconnecting from pipes. )
Fixed https://github.com/M3gaFr3ak/ExtraCells2/issues/18
2014-05-24 18:25:22 -05:00
AlgorithmX2
aa6d05af2e Fixed a potential crash when picking up items. 2014-05-24 18:23:40 -05:00
AlgorithmX2
1b207a17e9 API Update. 2014-05-24 18:23:23 -05:00
AlgorithmX2
d5cfa12f76 Added Energy Cells Charge levels to Waila 2014-05-24 18:22:50 -05:00
AlgorithmX2
397dbe8d10 Added Next button.
Added text for Amount gui.
2014-05-24 16:16:22 -05:00
AlgorithmX2
82a8e2d045 Fixed http://openeye.openmods.info/crashes/df3cca6850f2c037b6adb8d8d641b22f
Improved Exception for http://openeye.openmods.info/crashes/d2df850ad1915a015a80f9f7cef56ac3
Improved Exception for http://openeye.openmods.info/crashes/c8a3f70288f017726c5acd09ea91a2b0
2014-05-24 11:02:24 -05:00
AlgorithmX2
5f21711204 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-24 10:40:16 -05:00
AlgorithmX2
6e1a0aabb6 Server doesn't have noTesr Tiles. 2014-05-24 10:29:45 -05:00
AlgorithmX2
f5976e7b1d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-23 23:23:15 -05:00
AlgorithmX2
832c4ecdb9 Only show crafting/stored/both where applicable. 2014-05-23 23:21:10 -05:00
AlgorithmX2
bc55956d56 Crafting Amount Gui Mostly Done, missing "Next Button" 2014-05-23 23:20:56 -05:00
AlgorithmX2
26dcae3f9b Send Crafting Gui Packet to open second gui. 2014-05-23 20:35:27 -05:00
AlgorithmX2
ea936d3b72 Null classes are bad umm kay. 2014-05-23 15:51:25 -05:00
AlgorithmX2
a3264d03e2 Crafting CPUs now appear offline unless hey have their channel requirement met.
Also their status shows in waila.
2014-05-22 21:43:15 -05:00
AlgorithmX2
ef4cab8f61 Storage grid can now properly see crafting grid. 2014-05-22 21:42:27 -05:00
AlgorithmX2
168309ee50 Fixed Outputs for non-crafting Patterns. 2014-05-22 21:41:54 -05:00
AlgorithmX2
26540869ba removed dead code. 2014-05-22 21:41:35 -05:00
AlgorithmX2
e47bc5965d Update interface crafting lists. 2014-05-22 21:41:24 -05:00
AlgorithmX2
e2c3e18133 Added Crafting/Stored/Both setting to ItemRepo 2014-05-22 21:41:09 -05:00
AlgorithmX2
5f5fc4cee1 Fixed Crafting MB Names. 2014-05-22 21:39:21 -05:00
AlgorithmX2
01bf88061d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
Conflicts:
	container/implementations/ContainerStorageBus.java
	core/sync/packets/PacketValueConfig.java
2014-05-22 18:49:02 -05:00
AlgorithmX2
15aa825d30 Added Comments for Enum Settings.
Added Comment for wireless equation.
Removed Alpha Migration Option.
2014-05-22 16:29:10 -05:00
AlgorithmX2
f0ad27c5f3 Fixed http://openeye.openmods.info/crashes/64eb336042aeeec45dfd13edd30de8a6
Fixed http://openeye.openmods.info/crashes/bbefcf763be5224e4667519cf6c95933
2014-05-22 09:20:59 -05:00
AlgorithmX2
f4706d6612 Fixed Issue with NEI Grindstone Plugin pulling up the inscriber instead of the grindstone. 2014-05-21 22:35:40 -05:00
AlgorithmX2
e27bb272cf Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-05-21 21:09:38 -05:00
AlgorithmX2
cbe41337ed Added Clear and Partition Based on contents to Storage Bus. 2014-05-21 21:09:29 -05:00
AlgorithmX2
459239bfba Storage Buses no update their filters when their upgrades change. 2014-05-21 21:09:13 -05:00
AlgorithmX2
a8a4476e8e Fixed issue with ore cache, should now properly contain all the options instead of just the current item. 2014-05-21 21:08:38 -05:00
AlgorithmX2
569ed2f99e Bad Fuzzy Logic for Non-Damageable Items. 2014-05-21 21:08:13 -05:00
AlgorithmX2
6f8a367192 WTF is java making this stupid class for! 2014-05-21 13:24:58 -05:00
AlgorithmX2
cb0a450853 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-21 09:44:02 -05:00
AlgorithmX2
0f781cebba Sided TIlehash should make order matter. 2014-05-21 09:43:41 -05:00
AlgorithmX2
269bc40f0d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-20 22:17:52 -05:00
AlgorithmX2
dc0c015a97 Fix NPE. 2014-05-20 22:06:48 -05:00