Commit graph

159 commits

Author SHA1 Message Date
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
3d8a129531 Fixed Bug: #0518 - Using the WAT and switch via quickslots closes WAT GUI 2014-06-08 18:10:25 -05:00
AlgorithmX2
03330d02ba Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-06-06 21:10:26 -05:00
AlgorithmX2
a50505fed6 Fixed Bug: #0431 - Weird Inventory behaviour in SkyChests with InvTweaks 2014-06-06 21:04:59 -05:00
AlgorithmX2
fe74989563 Keep Search when switching between crafting and normal view. 2014-06-02 21:04:47 -05:00
AlgorithmX2
905832ae85 Renamed ExtraTextures and added ExtraItemTextures. 2014-05-25 20:58:44 -05:00
AlgorithmX2
fa376237fd remove unused variable, and added lumen cable. 2014-05-25 17:43:17 -05:00
AlgorithmX2
bd7b154455 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-25 00:03:27 -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
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
e2c3e18133 Added Crafting/Stored/Both setting to ItemRepo 2014-05-22 21:41:09 -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
cbe41337ed Added Clear and Partition Based on contents to Storage Bus. 2014-05-21 21:09:29 -05:00
AlgorithmX2
fa1feff8f0 Added View Button ( dosn't work ) 2014-05-19 23:13:25 -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
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
b0aedc1b01 MAC Now shows progress. 2014-05-08 23:09:42 -05:00
AlgorithmX2
1db9283eed Swapped out Gui Sync with something a little more fancy. 2014-05-07 00:22:42 -05:00
AlgorithmX2
24d497e583 MAC Gui upgrade slots and network tool fixes. 2014-05-06 21:21:12 -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
66a7e191a4 If you have more then 10,000 of any part it now properly converts to "10k" instead of showing an unlocalized string 2014-05-04 19:24:42 -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
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
34abc147bc Minimum of 3 rows. 2014-04-26 21:54:08 -05:00
AlgorithmX2
eadd67a34c Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-24 02:14:58 -05:00
AlgorithmX2
07a98270c3 Fixed #0356 - Scrollbar is locked after right click searchbox 2014-04-24 02:13:33 -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
2e71a6530e Added NEI Sync. 2014-04-19 23:35:13 -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
f5fc2ba18e Removed Terminal style from Portable Cell Gui.
Portable Cell now only shows 3 rows now, like it should.
Security Gui now has the proper width.
Fixed bug introduced in #90 to show background behind security terminal slots.
2014-04-16 13:48:03 -05:00
AlgorithmX2
71b5fd4555 Hid View Cells on Portable Cell and ME Chest. 2014-04-16 12:16:21 -05:00
AlgorithmX2
d84be03027 Large chunk on the pattern terminal. 2014-04-09 23:51:08 -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
697d81d895 Fixed Obfuscation Issue with Guis. 2014-03-29 22:19:15 -05:00
AlgorithmX2
794177b8d2 Fixed Bug: #0260 - Hotbar Keys + Inscriber 2014-03-29 18:36:37 -05:00
AlgorithmX2
c40c81070c All Terminals now can be opened in low power / channel state and show dark slots. 2014-03-27 23:31:06 -05:00
AlgorithmX2
95b1572aa1 Added Small Vs Tall Terminal Display Setting. 2014-03-27 00:14:34 -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
754d2c25d9 Sided Inventories now properly observe their own rotation. 2014-03-13 21:59:37 -05:00
AlgorithmX2
0ed0af3d34 Inscriber Functional, No render. 2014-03-11 22:26:50 -05:00
AlgorithmX2
cd51b00b31 Basic Block/Gui/Tile registertion work for Inscriber is done. 2014-03-07 00:15:54 -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
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
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
d32137a336 Added Sky Rock.
Added Sky Chest.
2014-02-28 02:12:00 -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
b219c950f4 Added clear button to crafting terminal. 2014-02-26 22:47:06 -06:00
AlgorithmX2
076ddd548f Added Space Clicking in AE Inventories. 2014-02-26 21:56:00 -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
85b053f6b5 Fixed Bug: #0161 - Missing Formation Plane Priority Screen Back Button. 2014-02-18 11:44:45 -06:00
AlgorithmX2
da8677b70a Formation Plane Added. 2014-02-17 23:51:31 -06:00
AlgorithmX2
646dafcc99 Moved Sorting Config Into the World. 2014-02-16 18:50:25 -06:00
AlgorithmX2
ca738e6065 Standard and Auto Search Settings. 2014-02-16 03:09:20 -06:00
AlgorithmX2
12d3d4e548 Hide "Passive Drain" for items with no idle drain. 2014-02-16 01:33:49 -06:00
AlgorithmX2
e3890b4b11 Item Counts now appear in tooltips for ME Slots. 2014-02-15 22:44:35 -06:00
AlgorithmX2
0a3474291c Fixed red on upgrade slots. 2014-02-12 21:42:48 -06:00
AlgorithmX2
7f35b2ab07 Fixed Installable Upgrade Limit Bug. 2014-02-11 23:26:19 -06:00
AlgorithmX2
9513e7c99d CoreMod Stuff. 2014-02-11 03:04:59 -06:00
AlgorithmX2
74ce7156c4 Add Core Mod to Enable AE Slots ( Temporary? ) 2014-02-11 02:39:15 -06:00
AlgorithmX2
5f8570abdc Rename Configuration to AE Config 2014-02-08 23:08:27 -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
c3549e483c Fixed Bug with Terminal Scroll Bar and Searching.
Switched to Reactive Packet size protection.
2014-02-06 10:57:01 -06:00
AlgorithmX2
084d45530d Removed Sort By in security terminal. 2014-02-05 23:08:05 -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
f8e6a426ce Tweaked Terminal Gui to use smaller textures.
Crafting Terminal Added, ( incomplete )
Moved FMP Cut-able Registration to Init.
Upgrades now drop when parts break.
TE -> TE3 pulverizer api.
2014-02-04 20:44:54 -06:00
AlgorithmX2
dc754b4989 Missing Gui. 2014-02-03 22:27:49 -06:00
AlgorithmX2
8b81545abf Wireless Terminal Gui Works, dose not support range, or WAPs 2014-02-02 23:02:54 -06:00
AlgorithmX2
b7d90b989d Begin work on Wireless Terminal Gui. 2014-02-02 22:33:50 -06:00
AlgorithmX2
af8e356bec Wireless block no uses placed side to orient, this is more natural for it instead of the place based version.
Added Wireless Encoder Gui to the Security Term
Security Term now only accepts Biometric Cards in the config slot.
Added Wireless Block.
Added Wireless Terminal.
Fixed Crash when loading world settings.
Configure slot of Security Block now drops on destruction.
2014-02-02 01:32:10 -06:00
AlgorithmX2
58d9939503 Fixed Crash in Portable Cell.
Can no longer pick up Open Portable Cell.
Can no longer insert Portable Cell into itself.
2014-02-01 16:25:15 -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
8460cffd6c Allow Visual/Non Visual Boxes to differ for Custom Collsion / Buses. 2014-01-31 11:11:50 -06:00
AlgorithmX2
dd37b28190 Started Working on Security Gui. (incomplete) 2014-01-31 00:33:31 -06:00
AlgorithmX2
82a862705b Added Slot Ghost Images.
Fixed Issue with Condenser button not supporting right clicking.
Condenser gui now shows costs in tooltip.
2014-01-30 21:08:44 -06:00
AlgorithmX2
c981c637f9 Massive Localization Update. 2014-01-30 12:54:32 -06:00
AlgorithmX2
b21af365cf Shift+Right Click. 2014-01-29 19:20:48 -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
5a6cd05e20 Gui/Priority Tab/Storage work. 2014-01-26 00:44:50 -06:00
AlgorithmX2
2e8ffc4a09 Work on Storage Bus. 2014-01-24 10:35:58 -06:00
AlgorithmX2
cf8c931cb5 Fixed some wonkeyness with Network Status Gui 2014-01-24 10:32:57 -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
53c5285ea0 Started Working on CellWorkbench 2014-01-06 00:54:25 -06:00
AlgorithmX2
517e8ccda4 Moved IStorageMonitorable 2014-01-05 02:49:24 -06:00