Commit graph

60 commits

Author SHA1 Message Date
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
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
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
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
9ba1b133d7 Fixed Bug: #0432 - Weird Inventory behavior in Quartz Cutting Knife
Removed logging from Migration Items.
Improved logging for http://openeye.openmods.info/crashes/42defba4fcc4c4571a45edaaba3af4c3
Improved logging for http://openeye.openmods.info/crashes/cbda180edb2fba39c4fe27a7f5266fec
2014-05-14 10:55:45 -05:00
AlgorithmX2
a04bc65e35 Code Style / Cleanup 2014-05-11 13:30:54 -05:00
AlgorithmX2
788dbb8610 Fixed possible crash with Interfaces and Storage Buses. 2014-05-04 14:54:21 -05:00
AlgorithmX2
60d1ecc965 Storage bus can now update all the way down to zero items for External Storages. 2014-05-03 23:14:30 -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
4a2c7c2710 Fixed issue with NEI and font size.
Added Crafting Terminal Integration for NEI.
Added Inscriber Recipe Plugin for NEI.
2014-04-30 23:01:22 -05:00
AlgorithmX2
a4eb01b191 Allow security hand shakes for monitorables. 2014-04-17 22:33:48 -05:00
AlgorithmX2
27f374eb04 Added Rotatable Blocks integration. 2014-04-03 23:12:35 -05:00
AlgorithmX2
b86fb56999 Fixed invalid Orientation.
Improved Logging for render mismatch.
2014-03-22 13:27:44 -05:00
AlgorithmX2
0bfded7bbf Fixed Bug: #0210 - Fuzzy on an export bus do not ignore NBT data and metadata.
Fixed Serious issue with items with the same hashes merging.
2014-03-21 22:58:03 -05:00
AlgorithmX2
929efa5597 Added 4 View Cell Slots.
Multiple View Cells now sum together to allow more customization.
View Cells are now protected by Build Security.
Meteorite Compass now renders correctly in other peoples hands.
2014-03-04 21:12:23 -06:00
AlgorithmX2
1b6e2bd2c3 Entropy Manipulator Can now be dispensed.
Matter Cannon Can now be dispensed.
2014-02-27 01:10:45 -06:00
AlgorithmX2
9f0f84a93f Added Sort By Inventory Tweaks.
NEI and Invtweaks options are now hidden without the supporting mod.
2014-02-27 01:10:11 -06:00
AlgorithmX2
1a75097e84 Removed Block Definitions for MAC Parts.
Removed Options For MAC and Crafting.
Added Options for Crafting with Quartz Growth and Fluix Reaction.
EU Tunnels Re-Added ( Limit 1 per block. )
Adjusted naming/categorization of various features.
Added "sparkle" effect to seeds that are "growing"
2014-02-23 16:50:53 -06:00
AlgorithmX2
8c3973f809 Fluids are Not StorageChannel.ITEM. 2014-02-21 15:19:30 -06:00
AlgorithmX2
cf6b0986fc Fortify ItemLists. 2014-02-21 14:36:40 -06:00
AlgorithmX2
eb15bd3a68 Added Energy Watcher API
Added Event to Recalculate Channel Requirements for a Node.
Level Emitter can now output redstone based on network energy levels.
Level Emitter's entry field can now hold longs ( text box supports up o trillions )
2014-02-21 00:10:38 -06:00
AlgorithmX2
646dafcc99 Moved Sorting Config Into the World. 2014-02-16 18:50:25 -06:00
AlgorithmX2
ff4ff91f85 NBT Fixery. 2014-02-15 01:05:28 -06:00
AlgorithmX2
91de4d56e4 Fixed NBT Crash. 2014-02-15 00:30:25 -06:00
AlgorithmX2
dcf23f4c03 Entropy Manipulator Fixes. 2014-02-14 21:16:44 -06:00
AlgorithmX2
480f4b8180 Cables now use simplified rendering. 2014-02-13 23:32:35 -06:00
AlgorithmX2
09cee7b9f5 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-02-12 23:33:38 -06:00
AlgorithmX2
7f773f0d2b Fuzzy now supports the ore dictionary again. 2014-02-12 23:24:07 -06:00
AlgorithmX2
118f13edff Fixed typos, added proper argument-javadoc - Api Sync. 2014-02-12 10:35:42 -06:00
AlgorithmX2
7367502d75 Mark All the Things as Dirty. 2014-02-08 23:59:38 -06:00
AlgorithmX2
d50c7f6312 Ported to 1.7 2014-02-08 19:34:52 -06:00
AlgorithmX2
b57804be06 Removed Localization Stuff.
Added Logging Option.
Logging of Exceptions is now done via AELogger
2014-02-07 14:37:22 -06:00
AlgorithmX2
071c10f94b Removed random value.
compareToIgnoreCase instead of compareTo
2014-02-05 22:47:52 -06:00
AlgorithmX2
e79e866417 Adjusted Terminal Packet Limits.
Fixed random errors thrown when FMP is installed.
Finished Crafting Terminal Basic Features.
2014-02-05 01:25:44 -06:00
AlgorithmX2
2d61ca3fd0 Removed TE p2p wrapper. 2014-02-01 20:52:37 -06:00
AlgorithmX2
fbcee6ca12 Facade Creative Tab and Config. 2014-02-01 16:24:13 -06:00
AlgorithmX2
ee99dce791 Removed All Incomplete Items From Build.
Fixed Security GUI leaking into other Guis.
Fixed Bug in AE Fluid Stacks.
Fixed Power Drain in Matter Cannon if there is no ammo.
Fixed Not being able to store empty storage cells in Portable Cell.
Fixed Red Background on Upgrade Slots.
2014-02-01 12:13:12 -06:00
AlgorithmX2
97eaf35f6a Security Block Fully Functional. 2014-01-31 23:37:27 -06:00
AlgorithmX2
e134a9806b Add packet read methods for API. 2014-01-31 16:26:08 -06:00
AlgorithmX2
d10033fb50 Fixed issue with wrong item being extracted with buses in precise mode. 2014-01-30 18:50:39 -06:00
AlgorithmX2
d1b67870e9 Wrench Fix? 2014-01-30 12:53:06 -06:00
AlgorithmX2
0f75db5e80 Pretty much all of security minus the gui.
and all the stuff I did that i forgot to comment.
2014-01-26 22:00:36 -06:00
AlgorithmX2
42424f80c8 Refactoring API stuff 2014-01-23 13:02:48 -06:00
AlgorithmX2
dfbc8a6c79 ME Tunnel + Network Tool 2014-01-23 10:28:12 -06:00
AlgorithmX2
834e9c04c5 Err too much. 2014-01-20 10:41:37 -06:00
AlgorithmX2
88bb735ed8 Fixed Weird fuzzy business 2014-01-06 00:55:16 -06:00
AlgorithmX2
ef4efd5ce0 isFluid/isItem 2014-01-05 02:45:29 -06:00
AlgorithmX2
851d3cca7c Security Update. 2014-01-05 02:43:49 -06:00