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

346 commits

Author SHA1 Message Date
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
AlgorithmX2
76de1cf185 Item Tunnels now cycle Outputs. 2014-06-08 18:54:38 -05:00
AlgorithmX2
a1acc1d2d3 More NEI Shinanigans. 2014-06-08 17:30:17 -05:00
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
AlgorithmX2
bba2f3ba25 Less null Items 2014-05-02 01:03:02 -05:00
AlgorithmX2
cc8c3bb75e Implemented 5% Tunnel Tax. 2014-05-02 00:40:46 -05:00
AlgorithmX2
da764470a4 Use Cable from EiO to attune redstone flux. 2014-05-02 00:22:22 -05:00
AlgorithmX2
cd5e4caf7b Added P2P RF Tunnel. 
Added Added thread local for network recursion for later ( 1.8 ).
 2014-05-02 00:00:14 -05:00
AlgorithmX2
40de3da454 Added Railcraft Integration. 2014-05-01 21:49:19 -05:00
AlgorithmX2
9238a530bb Added World and Grindstone NEI Plugins. 2014-05-01 00:32:58 -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
8a9136cbb3 Attempt Number two are making config generation consistent. 2014-04-28 15:00:53 -05:00
AlgorithmX2
e95da25144 Started Work in MAC Gui. 2014-04-24 01:14:26 -05:00
AlgorithmX2
e9759f681e Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-20 13:53:43 -05:00
AlgorithmX2
c5f2a3914e Fixed Bug: #0347 - 'Search Box Mode' and 'Terminal Style' are not saved/loaded 2014-04-19 23:12:25 -05:00
AlgorithmX2
cb42ce164c Move RenderManager interaction to Post Init ( fixes some kind of weird conflict with a key bind mod ) 2014-04-19 20:41:43 -05:00
AlgorithmX2
323342314c Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-17 22:39:59 -05:00
AlgorithmX2
a4eb01b191 Allow security hand shakes for monitorables. 2014-04-17 22:33:48 -05:00
AlgorithmX2
cb81f34db3 Added IMC Support for P2P / Grinder / Spatial / MatterCannon 2014-04-17 21:52:39 -05:00
AlgorithmX2
67d46d57d2 Patterns can now be encoded. 
Added a clear button to the Pattern Terminal.
Added description to the Encoded Pattern Item.
 2014-04-17 01:15:56 -05:00
AlgorithmX2
f14581edae Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-16 23:39:03 -05:00
AlgorithmX2
4ee886c6ac Added Pattern Terminal Crafting. 2014-04-16 23:38:43 -05:00
AlgorithmX2
3736239658 Require AE2 Core. 2014-04-16 11:55:28 -05:00
AlgorithmX2
d84be03027 Large chunk on the pattern terminal. 2014-04-09 23:51:08 -05:00
AlgorithmX2
01c76a6870 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-09 20:12:49 -05:00
AlgorithmX2
e8c2725551 Minor enhancement to Error message. 2014-04-09 15:41:13 -05:00
AlgorithmX2
344c9eb370 Allow Subclasses of PlayerInventory. 2014-04-08 23:26:04 -05:00
AlgorithmX2
be1b22a3ee Crash, no log! 2014-04-08 22:14:03 -05:00
AlgorithmX2
316822fe71 Better Errors in GuiBridge. 2014-04-08 22:12:01 -05:00
AlgorithmX2
7dc251611c tiny progress... 2014-04-08 21:56:59 -05:00
AlgorithmX2
0cec53eece More Pattern Terminal Stuff. 2014-04-07 21:25:41 -05:00
AlgorithmX2
85b3a5ef32 Started Work on Pattern Terminal. 2014-04-07 19:43:57 -05:00
AlgorithmX2
13b3555d01 Added Copy Mode to the Cell Workbench. 2014-04-06 18:05:09 -05:00
AlgorithmX2
ee42c53f89 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-06 14:12:52 -05:00
AlgorithmX2
0036e050ca Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-04-06 01:55:36 -05:00
AlgorithmX2
5248eeeace Switched from FML Optional to AE Optional, lets me specify more interesting requirements for integration, and lets the config alter the resulting integration setup. 2014-04-06 01:55:24 -05:00
AlgorithmX2
97c06db6ef Use ordinal of parts/items as the default meta, allows for holes in the setup but lets default configs be consistent regardless of other mods. 2014-04-06 01:51:44 -05:00
AlgorithmX2
efa931a7a1 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-05 15:30:09 -05:00
AlgorithmX2
86c2ad49ee Removed Facade Creative Tab when they are disabled. 
Added Sky Stone to BC's Facades.
 2014-04-04 10:46:05 -05:00
AlgorithmX2
27f374eb04 Added Rotatable Blocks integration. 2014-04-03 23:12:35 -05:00
AlgorithmX2
c82663c1ac Fixed Bug: #0255 - Making a new world with AE2 loaded causes it to not save chunks. 2014-03-29 19:23:11 -05:00
AlgorithmX2
794177b8d2 Fixed Bug: #0260 - Hotbar Keys + Inscriber 2014-03-29 18:36:37 -05:00
AlgorithmX2
404cc08128 API"ed the Storage Cell Classes. 2014-03-27 19:48:38 -05:00
AlgorithmX2
a5379c82f8 Fixed Bug: #0246 - Typo 2014-03-27 19:33:35 -05:00
AlgorithmX2
95b1572aa1 Added Small Vs Tall Terminal Display Setting. 2014-03-27 00:14:34 -05:00
AlgorithmX2
2c4add0fdf Crafting Begin. 2014-03-25 22:06:54 -05:00
AlgorithmX2
16a691d42e Added Basic Graft Guide Support. 2014-03-24 02:55:46 -05:00
AlgorithmX2
0a98211af2 API Sync 2014-03-23 23:00:12 -05:00
AlgorithmX2
9e85c33b16 Enable FZ Integration - Crafting and Barrels ( Untested ). 2014-03-18 12:54:57 -05:00
AlgorithmX2
c2bcfeeb25 Adjustable Tick Rates. 2014-03-17 14:59:50 -05:00
AlgorithmX2
06903814ad Added Facade Crafting. 2014-03-15 15:35:00 -05:00
AlgorithmX2
d4ff8e731d Added Meteorite Spawn Distance Setting. 
Added Charged Quartz Spawn Chance.
All GUI's Parts/Tiles support Custom Localization. ( Fixes #0190 )
Added Crafting Recipe for copying Press Plates.
Fixed Bug: #0189 - Particles don't turn off when set to minimal
Fixed Bug: #0176 - Weird Colorization While Mining Parts.
Fixed Bug: #0152 - TPane drops parts as items and does not insert into system.
Fixed Bug: #0140 - Spatial pylon facade renders oddly (Clear)
 2014-03-15 01:58:21 -05:00
AlgorithmX2
a60d5a4cc7 Inscriber is fully functional, just needs textures. 2014-03-12 22:14:55 -05:00
AlgorithmX2
0ed0af3d34 Inscriber Functional, No render. 2014-03-11 22:26:50 -05:00
AlgorithmX2
a61b1525f0 Fixed Dead Lock + Refractor of Compass Service. 2014-03-10 23:33:55 -05:00
AlgorithmX2
d5748eb804 Cables now work in Recipes. 
Added Ingredient Resolver Sets.
Shrunk MC Chest Battery.
 2014-03-09 21:11:29 -05:00
AlgorithmX2
dfd24a6756 Website recipes need AE Items. 
Ignore BC Items.
 2014-03-09 16:39:30 -05:00
AlgorithmX2
49fcc7f510 Renamed Inscriber Recipe Type to Inscribe. 
Missing Icon now supports Items.
Fixed Missing Icons for debug Items.
SkyStone Chests can now be disabled.
More work on Website Recipes.
Removed Unused method in Network Handler.
 2014-03-08 21:35:53 -06:00
AlgorithmX2
6beaa85da6 Website Name Fix. 
Meteorite Spawns tweaked and chest contents tweaked.
Catch Dimension Registration.
 2014-03-08 17:31:09 -06:00
AlgorithmX2
cd51b00b31 Basic Block/Gui/Tile registertion work for Inscriber is done. 2014-03-07 00:15:54 -06:00
AlgorithmX2
a464686393 No more snow in spatial cells. 
Fixed 2 network connection bugs when QNB's re-connect/worlds unload.
Matrix Frame can no longer be removed or even hovered over, even in creative.
Spatial Pylons Can now be seen on the Network Tool Gui.
 2014-03-06 22:30:59 -06:00
AlgorithmX2
2e9d6641fe Fixed a bug with shift clicking. 
Added Quartz Knife Gui.
You can now make name presses with the quartz knife.
Added Inscriber Recipes.
Fixed Bug with Spatial Dim Registrations.
 2014-03-06 21:02:15 -06:00
AlgorithmX2
b62166bd08 Reconcile broken code. 2014-03-05 23:52:25 -06:00
AlgorithmX2
3f05965a06 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 2014-03-05 23:46:32 -06:00
AlgorithmX2
adb03c45c6 Added Current/Max Power to Network Tool. 
Added Current/Max Power to Spatial IO Port.
Added Required/Efficiency to Spatial IO Port.
Added Power Unit Button / Setting.
Fixed bug with Meteorite and Spatial IO.
Removed Random Logging in Spatial IO.
 2014-03-05 23:45:14 -06:00
AlgorithmX2
e8ec768d4c Website Recipe Exporter. 2014-03-05 13:34:56 -06:00
AlgorithmX2
040e948d8e Removed Dropped Features. 
Implemented Spatial Storage.
Fixed bug with ME Chest saying the cell was un-readable.
 2014-03-05 01:27:42 -06: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
4536189042 Added Sky Stone Dust. 
Added View Cell.
Configure View Cell in Cell Workbench.
View Cell Can Filter Terminals by being inserted into the Side Slot.
 2014-03-04 01:52:07 -06:00
AlgorithmX2
500558982f SkyStone Mining finalized. 
Added Ice meteorite spawn.
Fixed Crash with Meteorite Spawning.
 2014-03-03 22:56:08 -06:00
AlgorithmX2
58992d0786 Added Eraser Debug Tool. 
Meteorite Spawning Complete.
Removed a lot of test Logging.
 2014-03-02 17:18:15 -06:00