tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity
697 commits 7 branches 98 tags 24 MiB
Commit graph

213 commits

Author SHA1 Message Date
AlgorithmX2 faad4a6ba2 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-04 00:07:57 -05:00
AlgorithmX2 f894d48328 Add resistance to MultiItems to prevent crashes from invalid stacks. 2014-06-04 00:07:36 -05:00
AlgorithmX2 ba761aaa29 Improved Part API Errors. 2014-06-04 00:02:57 -05:00
AlgorithmX2 d28af7d3a7 removed for now. 2014-06-02 21:05:37 -05:00
AlgorithmX2 fe74989563 Keep Search when switching between crafting and normal view. 2014-06-02 21:04:47 -05:00
AlgorithmX2 900a278ec2 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 
Conflicts:
	core/localization/GuiText.java
 2014-05-31 20:58:52 -05:00
AlgorithmX2 baf5e66144 inWorldPurification messages split for each item, to improve clarity. 2014-05-31 20:57:20 -05:00
AlgorithmX2 0ac83b04c9 Changed Package Names. 2014-05-27 12:15:49 -05:00
AlgorithmX2 ac8effba3b Change path to layers. 2014-05-27 12:14:35 -05:00
AlgorithmX2 161f88e42c Added Paint Balls. 
Added Color Applicator.
 2014-05-26 03:26:37 -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 bd7b154455 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-25 00:03:27 -05:00
AlgorithmX2 1b207a17e9 API Update. 2014-05-24 18:23:23 -05:00
AlgorithmX2 397dbe8d10 Added Next button. 
Added text for Amount gui.
 2014-05-24 16:16:22 -05:00
AlgorithmX2 bc55956d56 Crafting Amount Gui Mostly Done, missing "Next Button" 2014-05-23 23:20:56 -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 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 6f8a367192 WTF is java making this stupid class for! 2014-05-21 13:24:58 -05:00
AlgorithmX2 24e76e5a88 Crafting Cache Registered and added events. 2014-05-19 23:13:12 -05:00
AlgorithmX2 68993534d9 Slowly working towards crafting. 
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

Conflicts:
	client/gui/widgets/GuiImgButton.java
	core/localization/ButtonToolTips.java
 2014-05-18 20:05:03 -05:00
AlgorithmX2 440ac95dc4 Change Tooltip for clear button in Crafting Terminal. 2014-05-18 14:53:18 -05:00
AlgorithmX2 b15d3af12b Crafting CPU basics. 2014-05-17 22:19:23 -05:00
AlgorithmX2 8838fc4ba6 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-15 21:43:11 -05:00
AlgorithmX2 6f96ae6074 Removed Alpha Migration. 
Fixed a crash when AE is rendering as a FMP Part.
Meteorite Loot is now less random.
Added support for CLApi ( might be neat as it develops )
 2014-05-15 21:18:30 -05:00
AlgorithmX2 25a588f303 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 
Conflicts:
	container/AEBaseContainer.java
	core/sync/AppEngPacketHandlerBase.java
 2014-05-13 19:25:07 -05:00
AlgorithmX2 ff12aa1673 Added Shit+Mouse wheel to pick up / drop items. 
Added Partial ItemStack packets to report to the server what itemstack is the target of interation.
Fixed Repairing Items in CraftingTerminal.
 2014-05-12 23:11:19 -05:00
AlgorithmX2 45c292344f Fixed Dormant Chunk Cache. 2014-05-12 21:15:45 -05:00
AlgorithmX2 b2d240b6cc Crash Enhancement Tweak! 2014-05-12 21:15:31 -05:00
AlgorithmX2 c72b272da9 Merge branch 'mj6' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-05-11 17:06:33 -05:00
AlgorithmX2 1f73d68bb3 Upped another 30k packet limit to 2mb 2014-05-11 17:02:53 -05:00
AlgorithmX2 ce561ffbe3 Merge in Builder support. 2014-05-11 13:48:14 -05:00
AlgorithmX2 5771c19146 30k -> 2mb item size limit. 2014-05-11 11:25:15 -05:00
AlgorithmX2 d84ec9c0bf Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-10 17:19:26 -05:00
AlgorithmX2 570f098f81 Fixed a few more rendering/visual update glitches. 2014-05-10 13:27:48 -05:00
AlgorithmX2 08d6942643 Added all the crafting cpu "blocks" - needs textures and renders. 
Updated API
 2014-05-10 00:00:02 -05:00
AlgorithmX2 3491fe4e33 Did what I could with mj6 2014-05-09 21:08:56 -05:00
AlgorithmX2 98fc460da0 Removed Old RF Api. 2014-05-09 09:42:52 -05:00
AlgorithmX2 1db9283eed Swapped out Gui Sync with something a little more fancy. 2014-05-07 00:22:42 -05:00
AlgorithmX2 3351af3d4e Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 
Conflicts:
	items/materials/MaterialType.java
	util/Platform.java
 2014-05-06 20:45:38 -05:00
AlgorithmX2 50aa0b9062 Added GrinderLogging and hid Grinder Logging behind it. 2014-05-06 14:56:06 -05:00
AlgorithmX2 e60faf5ab0 Remove Meta values from Config. 
Fixed a number of rendering gltiches with Smart/Covered Cables
 2014-05-06 00:16:29 -05:00
AlgorithmX2 4d5a6ce301 Add Stained Glass facades. 
The Item Bus Renderer can now deal with Alpha Pass.
 2014-05-04 15:46:38 -05:00
AlgorithmX2 5dbba26930 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-03 19:23:48 -05:00
AlgorithmX2 e1c6b18399 Special Handlers are now properly wrapped in IMEMonitors for Storage Bus to function properly. 2014-05-03 19:21:33 -05:00
AlgorithmX2 3c510b6925 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 
Conflicts:
	core/localization/GuiText.java
	core/sync/AppEngPacketHandlerBase.java
 2014-05-03 14:12:19 -05:00