Commit graph

265 commits

Author SHA1 Message Date
AlgorithmX2
0244bb943f Merge branch 'rv1' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-07-24 22:48:06 -05:00
AlgorithmX2
9223f724bf Added Feature: #0715 - Mekanism recipes
Added Feature: #0702 - Mekanism Power for Energy Acceptor
2014-07-24 22:20:52 -05:00
AlgorithmX2
6ef95e0586 Improved Handling of Pattern Corruption. 2014-07-24 10:59:57 -05:00
AlgorithmX2
8bcd346226 Storage Buses no longer assume an inventory can be accessed just because it implements IInventory. 2014-07-23 17:39:42 -05:00
AlgorithmX2
980dff203f IntegrationType Re-factor. 2014-07-23 17:26:23 -05:00
AlgorithmX2
6aab1c2e35 Show Channel Usage for smart and dense cable in Waila.
Waila Plugin now works when parts are in FMP Tiles.
2014-07-22 00:47:24 -05:00
AlgorithmX2
3f29590fad Paint balls now color entities their color when they get hit for 30 or so seconds ( mostly works ).
Paint balls now color sheep.
The Color Applicator can now accept snow balls.
Snowballs can be used to clean paint balls, and to clean cables ( restore fluix )
Tweaks to Color API.
2014-07-20 22:45:08 -05:00
AlgorithmX2
f355fc1643 Initial Paint Ball Implementation. 2014-07-20 03:53:05 -05:00
AlgorithmX2
1a1025b8c9 API Synced or Spatial, also one last change with grinder. 2014-07-20 01:51:51 -05:00
AlgorithmX2
fdc263702e API Synced with Grinder canges. 2014-07-20 01:50:50 -05:00
AlgorithmX2
683a5ee765 Added Feature: #0633 - [Aesthetical] Recoloring of specific blocks 2014-07-16 23:44:02 -05:00
AlgorithmX2
e49864e295 Nameable CPUs. 2014-07-15 22:26:12 -05:00
AlgorithmX2
862c89e1f0 Added Light Detector 2014-07-15 20:26:04 -05:00
AlgorithmX2
0f50c05a7d Added Light P2P Tunnel 2014-07-15 02:25:03 -05:00
AlgorithmX2
c6e6aca7cb Renamed Debug Option. 2014-07-13 22:21:28 -05:00
AlgorithmX2
061c995136 Add XU item and fluid to attunement. 2014-07-13 02:13:17 -05:00
AlgorithmX2
48bc15fd82 Silly import. 2014-07-12 16:21:01 -05:00
AlgorithmX2
ef759c7a7e Started adding recipes to rv1 items. 2014-07-11 15:07:16 -05:00
AlgorithmX2
7242dfeb08 Fixed Crafting CPU Render.
Finished Crafting Confirm Screen
Added logic to prevent crafting in cpus with too little storage.
2014-07-10 23:46:51 -05:00
AlgorithmX2
d2e332eedb Fixed NEI Ghost Overlays. 2014-07-09 22:18:50 -05:00
AlgorithmX2
0e676f5171 GameProfile API Sync. 2014-07-09 15:07:53 -05:00
AlgorithmX2
16ef731c00 Interface Terminal
Fixed bug with Assembler Packet Crashing the server.
2014-07-09 03:17:11 -05:00
AlgorithmX2
813c1bcb58 Considerable progress on Interface terminal. 2014-07-07 22:48:21 -05:00
AlgorithmX2
f3344f28c0 Added Animation for MAssembler 2014-07-06 21:04:58 -05:00
AlgorithmX2
6ce5a8f4c5 Improved NEI Integration and Pattern Terminal Support 2014-07-06 01:52:29 -05:00
AlgorithmX2
fa542c7d15 Add Upgrade Features to Interface, and add Buttons to Interface and Export Bus o alter crafting behavior. 2014-07-04 20:59:50 -05:00
AlgorithmX2
14187dc799 Added Packet Logging
Added Crafting Logging
2014-07-04 17:43:53 -05:00
AlgorithmX2
0a470eefc2 Crafting Machine Link API, and Export bus crafting implementation. 2014-07-04 01:19:35 -05:00
AlgorithmX2
eb691e1802 Assign Crafting Upgrade. 2014-07-04 01:17:58 -05:00
AlgorithmX2
844b4843c0 Crafting API Added
Fixed tons of issues with CPU multi block weirdness.
2014-07-02 23:48:18 -05:00
AlgorithmX2
4ce40869f4 Fix issues with Pattern Terminal. 2014-07-01 20:43:08 -05:00
AlgorithmX2
36f81cf0b7 MORE Gui work for crafting 2014-06-29 04:06:07 -05:00
AlgorithmX2
85f607b76f Merge branch '1.7.10' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-28 20:53:09 -05:00
AlgorithmX2
5c2d66aa28 1.7.10 - requires, guess what -- 1.7.10 2014-06-28 20:33:32 -05:00
AlgorithmX2
297c957787 Master requires 1.7.2 2014-06-28 20:32:07 -05:00
AlgorithmX2
c8bdf1bd45 Crafting Plan Screen is almost done. 2014-06-28 15:18:36 -05:00
AlgorithmX2
c99964dad6 Finished Crafting CPU Gui. 2014-06-28 00:20:12 -05:00
AlgorithmX2
2a8c028ab9 minor cpu gui work. 2014-06-26 21:47:26 -05:00
AlgorithmX2
4ab4b335c3 Started work on Crafting CPU Gui 2014-06-25 20:49:37 -05:00
AlgorithmX2
ff9a10b926 Crafting is virtually working 100% 2014-06-22 02:00:38 -05:00
AlgorithmX2
e732304cac Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-19 20:19:28 -05:00
AlgorithmX2
5c0ac30bf9 Prevent Config from saving during loading process. 2014-06-19 16:15:34 -05:00
AlgorithmX2
32ee57c3a9 Separated Crafting job into a worker thread.
Crafting calculation can be canceled.
Hooked up a crafting calculation launch and the confirmation GUI.
2014-06-18 01:23:37 -05:00
AlgorithmX2
0a18f2d926 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-17 23:36:53 -05:00
AlgorithmX2
d7ca8e519a Improve No Biomes crash, and don't register Spatial if spatial is disabled. 2014-06-17 16:46:01 -05:00
AlgorithmX2
1632d2d72e Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
Conflicts:
	items/tools/powered/ToolMassCannon.java
2014-06-16 00:51:51 -05:00
AlgorithmX2
472d5cb1c0 Request Crafting Packet. 2014-06-16 00:49:37 -05:00
AlgorithmX2
92f728be67 Crafting Calculator mostly works now - is missing features however. 2014-06-16 00:48:43 -05:00
AlgorithmX2
0324dc62b9 Creative Tab now available server side; fixes https://github.com/Dynious/RefinedRelocation/issues/83 2014-06-13 13:41:50 -05:00
AlgorithmX2
652d2e6018 Also Cables no longer glow in the dark :P
Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

Conflicts:
	core/localization/GuiText.java
2014-06-08 21:13:53 -05:00