Commit graph

284 commits

Author SHA1 Message Date
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
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
8183becfd4 Paint Balls. 2014-05-31 20:50:56 -05:00
AlgorithmX2
e17ac60141 Fixed Bug: #0470 - Incorrect search with russian capital letters 2014-05-29 11:51:07 -05:00
AlgorithmX2
161f88e42c Added Paint Balls.
Added Color Applicator.
2014-05-26 03:26:37 -05:00
AlgorithmX2
82ac1eb2e7 Add support for Mouse Wheel Event passing to Items. the clean way. 2014-05-26 03:25:17 -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
269bc40f0d Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-20 22:17:52 -05:00
AlgorithmX2
dc0c015a97 Fix NPE. 2014-05-20 22:06:48 -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
b15d3af12b Crafting CPU basics. 2014-05-17 22:19:23 -05:00
AlgorithmX2
cfeebae5ac First pass at trying to make a CPU render - is basically a multiblock heat vent at this point. 2014-05-15 09:34:38 -05:00
AlgorithmX2
322b0a7da7 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-13 21:57:17 -05:00
AlgorithmX2
974a41eabb Solved the mystery of the broken lighting. 2014-05-13 21:56:57 -05:00
AlgorithmX2
6a8fafa58d Working Towards Crafing CPU MultiBlock 2014-05-13 21:42:14 -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
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
b0aedc1b01 MAC Now shows progress. 2014-05-08 23:09:42 -05:00
AlgorithmX2
39282b8e14 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-05-07 20:54:49 -05:00
AlgorithmX2
0338902021 No more null icons! 2014-05-07 20:54:28 -05:00
AlgorithmX2
dd74fce634 Added some assertions about null icons. 2014-05-07 17:21:48 -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
3080510317 Major Update for Cable Rendering.
TESRs will are no longer used if the tile contains no dynamic renders.
Added alpha pass rendering for stained glass.
Enabled Stained Glass facades.
Cables / Facades have less geometry by hiding faces on connected boxes.
Added AlphaPass Option to disable AlphaPass Cables rendering ( fixes crash with Immbis Microblocks. )
2014-05-04 19:51:05 -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
4d5a6ce301 Add Stained Glass facades.
The Item Bus Renderer can now deal with Alpha Pass.
2014-05-04 15:46:38 -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
27b9d0f4cd Energy FX is now much more light weight. 2014-04-24 02:13:52 -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
589e2d60d2 Pattern slots now report the output qty as well as the item type, at all times ( not just when shift is held ) 2014-04-23 00:30:29 -05:00
AlgorithmX2
94951b4209 Render output of pattern when shift is held. 2014-04-23 00:18:44 -05:00
AlgorithmX2
85f15e7c06 Pattern Renderer ( for shift ) 2014-04-22 20:36: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
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
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
506b7a7129 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-14 02:39:39 -05:00
AlgorithmX2
922ade793c Fixed Bug: #0315 - game crashes when ME controller is placed at bedrock level 2014-04-14 02:39:14 -05:00
AlgorithmX2
2de3ab4505 Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1 2014-04-10 22:02:23 -05:00
AlgorithmX2
327c1d4118 Ported FMP Support to 1.7. 2014-04-10 14:52:17 -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
c73ce116c5 Removed Totally unused class. 2014-04-03 23:31:24 -05:00
AlgorithmX2
59f3c703e2 Separated Textures for many parts. 2014-04-03 23:31:10 -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
14282ff4c3 Fixed Bug: #0250 - meteorite compass bug? 2014-03-29 03:10:52 -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
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
643768fd9a Less Taught. 2014-03-26 23:08:47 -05:00
AlgorithmX2
f571e41198 Fix Z-FIghting.
Fix Bounding Box.
2014-03-26 22:57:38 -05:00
AlgorithmX2
b86fb56999 Fixed invalid Orientation.
Improved Logging for render mismatch.
2014-03-22 13:27:44 -05:00
AlgorithmX2
c4a7d5b480 Added Rotatable Interfaces. 2014-03-19 22:28:53 -05:00
AlgorithmX2
0e46690c50 Spatial "Sky Render"
Close File Handles, and attempted to GC the CompassReader.
2014-03-15 14:53: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
754d2c25d9 Sided Inventories now properly observe their own rotation. 2014-03-13 21:59:37 -05:00
AlgorithmX2
c77c48092f Inscriber Render 'done' 2014-03-13 21:29:31 -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
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
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
587803d3fa Less breaking Shit, More Render Fixes. 2014-03-04 21:56:20 -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
792249f8fd Added Sky Stone Tracking.
Added Meteorite Compass Block / Item.
Added Meteorite Spawner Debug Item.
Some Refactoring.
2014-03-02 02:35:11 -06:00
AlgorithmX2
fb6bb1a964 Fix bug with Sky Stone Block Chest not rendering Block Version After World Re-Load. 2014-03-01 01:39:46 -06:00
AlgorithmX2
27b30588a6 Add Sky stone, Block, Brick, Small Brick, and Sky Stone Block Chest.
Add All Sky Stone Crafting Recipes.
2014-02-28 21:45:30 -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
a71c1ee08c Catch Weird Crash. 2014-02-24 11:27:26 -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
5e0bf9c5b9 Fix Crash When using Debug Blocks.
Register Quartz/Fluix Blocks with BC Facades.
2014-02-23 14:06:07 -06:00
AlgorithmX2
e94b0bbe60 Re-Enabled IC2 API.
Relocated Entity Package.
Removed Blank Patterns Item.
2014-02-22 19:28:52 -06:00
AlgorithmX2
302a41ac76 Added Crystal Growth Accelerator.
Fixed Missing Textures.
2014-02-22 16:14:43 -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
921c681b47 Buses now render properly in Item Frames.
Fixed Issue with Storage Monitor Renders.
Fixed  a render glitch on formation/annihilation entity form.
2014-02-19 22:20: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
02f2eb00bd Network tool is now powered by black magic. 2014-02-16 15:28:50 -06:00
AlgorithmX2
ca738e6065 Standard and Auto Search Settings. 2014-02-16 03:09:20 -06:00
AlgorithmX2
0c24d0ef76 Improve Lighting cache. 2014-02-16 02:27:28 -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
644217baf5 Cache Lighting Data. 2014-02-15 00:30:06 -06:00
AlgorithmX2
5361416f57 Fixed Some Derpy Rendering. 2014-02-13 23:31:26 -06:00
AlgorithmX2
c3cf81b03f Particles Rules now have greater effect. 2014-02-13 23:31:02 -06:00
AlgorithmX2
07b1bb8473 Added Annihilation Plane. 2014-02-13 22:27:15 -06:00
AlgorithmX2
bceff8e902 Reset all rotations when rendering. 2014-02-13 20:26:32 -06:00
AlgorithmX2
22c575f06a Facades now render the correct texture on each side. 2014-02-12 23:33:27 -06:00
AlgorithmX2
0a3474291c Fixed red on upgrade slots. 2014-02-12 21:42:48 -06:00
AlgorithmX2
2080df115b Facades in hand now render better. 2014-02-11 23:42:55 -06:00
AlgorithmX2
7f35b2ab07 Fixed Installable Upgrade Limit Bug. 2014-02-11 23:26:19 -06:00
AlgorithmX2
16886b2ac7 Moved First Person render for parts closer to the center. 2014-02-11 20:44:23 -06:00
AlgorithmX2
ea9dead394 Anti Transparent Block Attempt 2? 2014-02-11 20:31:27 -06:00
AlgorithmX2
c329288e77 Revenge of the Flat Lighting 2014-02-11 20:01:01 -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
bc9cc1b9f3 Fixed Flat Lighting. 2014-02-09 18:27:14 -06:00
AlgorithmX2
1d523bdbcb Fixed Ghostly Renders. 2014-02-09 18:27:01 -06:00
AlgorithmX2
2286be4998 Removed some textures for now. 2014-02-09 12:35:06 -06:00
AlgorithmX2
d5aefbe055 Fixed minor render glitch with ME Chest. 2014-02-09 01:56:42 -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
e436dca760 Fixed bug with Energy Inject/Extract Averages.
SideOnly All the things.
Pulled Rendering for CableContainers out into a Proxy.
2014-02-06 23:51:19 -06:00
AlgorithmX2
4b14fc7f10 No more lower cases! 2014-02-06 20:44:37 -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
f295669e6e TESR should use less CPU when no-op.
onInventoryChange for FZ.
Networks without batteries can store up to 1000 AE.
Fixed a bug that cause energy to spiral out of control and go infinite.
Fixed a crash with storage buses and fluids.
2014-02-05 22:36:10 -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
93ac258ee7 Security Term now displays a message when there is no power.
Removed "No Message" Sorting.
You can no longer insert a biometric card for the Admin.
2014-02-02 13:00:57 -06:00