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
tterrag1098
2250bf876c
#2261 Nerf nether quartz ore SAG Mill recipe
2015-04-10 00:25:09 -04:00
tterrag1098
b480cbdc79
Merge pull request #2243 from Dwargkiller/flour
...
Flour/Bread
2015-04-05 18:03:50 -04:00
Dwargkiller
334479f069
Flour/Bread
...
Adds a flour item to avoid mod dependencies, as well as recipes to
increase bread yield from wheat (Wheat -> Sag Mill - > Flour -> Alloy
Smelter -> Bread). Final yield is 2 bread per wheat, compared to vanilla
1/3. It's comparable to Natura + Thermal Expansion.
2015-04-05 23:50:05 +02:00
tterrag1098
433acee90a
Merge pull request #1927 from HenryLoenwind/shears_darkSteelOnly
...
Dark Steel Shears
2015-04-05 16:45:07 -04:00
WLCD
a71d724c47
Added missing translations (final)
...
Added missing french translations
Corrected some little mistake
Standardized translation so that everything is coherent
2015-03-30 22:48:04 +02:00
tterrag1098
007552b812
Merge pull request #2114 from HenryLoenwind/baubles
...
More Baubles support
2015-03-29 01:29:00 -04:00
WLCD
c4044f4b21
Added missing translations (part2)
...
Additional translations done and/or added
2015-03-27 13:56:49 +01:00
WLCD
208979c09f
Added missing translation + minor corrections
...
- Added the missing item/conduits/machine/blocks/powders/etc...
- Corrected some mis-translations
- This is still a work in progress, I'll address the rest in a next update as soon as I can
2015-03-26 13:56:15 +01:00
tterrag1098
c757f51069
Turns out Gson allows comments, who knew?
2015-03-25 22:31:37 -04:00
HenryLoenwind
cd2d6cf73e
Dark Steel Shears
...
* Dark Steel Shears are crafted with 2 Dark Steel Ingots
* They are configurable more durable and configurable faster
* They can be empowered and will then AOE with a configurable radius
* I plan on adding another upgrade later (diamond edge)
2015-03-24 02:32:32 +01:00
HenryLoenwind
c9a7aab066
ingotAluminuim? ingotAluminium? ingotAluminum? What a mess...
...
re #2148
2015-03-22 16:37:39 +01:00
tterrag1098
e024666a4f
Merge all telepad models into one, add (very very basic) animation
2015-03-21 04:04:41 -04:00
tterrag1098
8605d02f3e
Partially implement telepad model
2015-03-20 00:09:39 -04:00
Henry Loenwind
139544af3e
Added bone meal support to farming station
...
* 2 new slots for bone meal
* Will try to use it on everything thats on the field and cannot be
harvested
* Different RF usage for successful and unsuccessfull tries
* Fix: Output slots no longer accept seeds
* Fix: "Only one tool per slot" policy works again
2015-03-20 03:16:23 +01:00
tterrag1098
39b871dd17
Merge pull request #2101 from HenryLoenwind/shearFarmer
...
Add more output slots to farming station
2015-03-19 22:08:42 -04:00