Commit Graph
852 Commits
Author SHA1 Message Date
tterrag1098 19134e706d #2542 Fix painter source slot positioning 2015-06-12 11:35:06 -04:00
tgstyle 1f862e7d1a A bit more cleanup, formatting, and consistency in XMLs.
Finishing up all files and fixed a few missed items in others.

Missed a couple items

Squash commits.
2015-06-04 10:03:50 -06:00
tterrag1098 ff81a3ed3a Merge pull request #2491 from tgstyle/master
Fixed spelling, some grammar, and a lot of formatting
2015-06-02 20:14:55 -04:00
tgstyle 84343561ae Fixed spelling, some grammer, and a lot of formatting
Formating, spelling changes to be consistent with the SAGMill xml

Formatting, spelling, and grammar to be consistent with other updated xml

Formatting, spelling, and grammar to be consistent with other xml

Update CrusherRecipeManager.java

Spelling, Formatting, grammar, and ignore nuggets on bonus
2015-06-02 16:41:45 -06:00
tterrag1098 29fd49cc01 Add button to sync inventory panel search field with NEI 2015-05-30 03:34:28 -04:00
tterrag1098 17d18995e9 Vastly improve conduit/facade sounds, facades play painted block sounds
Ref #2510
2015-05-27 18:53:57 -04:00
tterrag1098 129ef251c1 New non-bent capacitor textures 2015-05-27 02:35:25 -04:00
Matthias Mann 8f9cca470b return area can be toggled into storage area - should solve client/server desync issues 2015-05-23 22:22:32 +02:00
Matthias Mann dccdd478b6 allow to store crafting recipes in the inventory panel 2015-05-23 19:09:46 +02:00
CrazyPants 2a8d5367f7 Merge pull request #2253 from eduardog3000/barley
Add Natura Barley to Flour SAG Mill recipe.
2015-05-21 22:38:23 +08:00
Matthias Mann 018d9b63d9 #2479 Dark Glass 2015-05-17 08:47:09 +02:00
Matthias Mann f607a06656 remember filter and sort mode, show item count in tooltip for large stacks, fix NEI overlapping with GUI 2015-05-16 11:56:30 +02:00
tterrag1098 50542a8799 More new textures! 2015-05-15 02:29:40 -04:00
tterrag1098 72bf5832e0 Add tooltip to telepad, add coord selector recipe 2015-05-13 14:05:34 -04:00
Matthias Mann 63d7aa24ae allow storing the current crafting recipe for the crafting helper 2015-05-09 09:19:39 +02:00
tterrag1098 23a8a8b312 Merge pull request #2408 from MatthiasMann/issue_2407
#2407 allow more localization
2015-05-05 13:12:09 -04:00
tterrag1098 b58e0432dc Merge pull request #2389 from HenryLoenwind/baubles4capbank
Even more Baubles
2015-05-01 13:03:32 -04:00
Matthias Mann 1d8882eee3 #2407 allow more localization 2015-05-01 09:23:22 +02:00
Henry Loenwind ebec0bee6c Even more Baubles
* Baubles slots are now displayed in the Capacitor Bank. So the Magnet can be charged directly.
2015-04-30 00:21:25 +02:00
tterrag1098 0cc68ee4ac Merge pull request #2301 from Lilylicious/travelanchor
Elevator functionality and sneak activation
2015-04-29 17:21:02 -04:00
Dwargkiller c3f31ec2f4 Travel Anchor Elevators 2015-04-29 22:26:57 +02:00
tterrag1098 2c35b44baa Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git
Conflicts:
	src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java
2015-04-28 20:13:05 -04:00
tterrag1098 a5290472ec Add new telepad block textures 2015-04-28 20:12:15 -04:00
tterrag1098 54ca546f1d Merge pull request #2282 from Adaptivity/master
SAG Mill support for Tcon, Nether Ores
2015-04-28 15:44:08 -04:00
Anton ac63a166de Fixed AE2 recipes, fixed formatting. Closes #2356 2015-04-23 19:07:56 +03:00
tterrag1098 720cb6f971 Improve scroll widget thumb icon behavior when dragging 2015-04-19 23:48:04 -04:00
Matthias Mann df641b87d7 added recipes, first part of new textures 2015-04-20 05:05:43 +02:00
Matthias Mann d17e59eb06 now the inventory panel requires nutrient distillation to work 2015-04-20 05:05:43 +02:00
Matthias Mann d65a517c1b added clear button 2015-04-20 05:05:42 +02:00
Matthias Mann 4561199569 refill button 2015-04-20 05:05:42 +02:00
Matthias Mann e7e2efdec1 moved Remote Awareness Upgrade (with new icon from ChJees) into the new function upgrade slot, fixed overlapping tooltips in item conduit GUI 2015-04-20 05:05:42 +02:00
Matthias Mann b12b839d48 added tooltips to sort button, allow drag & drop of scrollbar thumb 2015-04-20 05:05:42 +02:00
Matthias Mann d8d1e5a23a added Remote Awareness Upgrade, new sort icons created by ChJees 2015-04-20 05:05:42 +02:00
Matthias Mann 9dd1d45078 GUI cleanup, mouse wheel and filter card support 2015-04-20 05:05:12 +02:00
Matthias Mann f26b0ba3df added GUI texts and tooltips, improve slot and item moving behavior 2015-04-20 02:47:55 +02:00
Matthias Mann 4632b4006a some icons 2015-04-20 02:47:55 +02:00
Matthias Mann f2473362c1 sorting for inventory panel 2015-04-20 02:47:55 +02:00
Matthias Mann e4c10a3e4b first part of the inventory panel (WIP) 2015-04-20 02:47:54 +02:00
tterrag1098 edebf2d1a3 Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO into inhibitor_obelisk 2015-04-14 03:06:08 -04:00
tterrag1098 2e7351f3cd Add in base inhibitor functionality 2015-04-14 03:05:09 -04:00
Anton bfd6cbdccf Update ru_RU.lang 2015-04-13 14:47:19 +03:00
tterrag1098 3d0ce4bcad #2303 Improve tooltip on KJ/ZG tanks 2015-04-13 04:30:07 -04:00
tterrag1098 eae3c8be49 Clean up widgets sheet - remove old textures and organize 2015-04-13 03:53:22 -04:00
Anton c67dffa487 SAG Mill support for Tcon, Nether Ores 2015-04-11 16:09:56 +03:00
tterrag1098 56ad53480a Merge pull request #2276 from Dwargkiller/certusadjustments
Conforms Certus Quartz
2015-04-11 03:03:09 -04:00
Dwargkiller 8a534f2eaf Aluminum Support
Sag Mill Aluminum oredict support
2015-04-11 04:35:40 +02:00
tterrag1098 2a948cdc5f Merge pull request #2189 from WLCD/patch-3
Added missing French translations (final)
2015-04-10 19:41:23 -04:00
Dwargkiller fd4118bab4 Conforms Certus Quartz
To maintain internal consistency, the certus quartz recipes are adjusted
to conform to the Nether Quartz recipes.
2015-04-10 22:16:43 +02:00
tterrag1098 e92b212fc2 Update widgets sheet texture, remove unused telepad texture 2015-04-10 13:43:35 -04:00
Matthias Mann 8ddc335a5d #2269 don't allow upgrading capbanks when they have items in their inventory, also show how many items they contains in the tooltip 2015-04-10 18:54:20 +02:00