Commit Graph
749 Commits
Author SHA1 Message Date
tterrag1098 0f47c44d55 Merge pull request #1920 from Neodark7/master
Added Biomes O' Plenty ores recipes in SAGMill
2015-02-14 00:07:24 -05:00
neodark7 0a7a91baec Fixed BoP ores integration again 2015-02-14 06:05:17 +01:00
tterrag1098 cb311e1b4d Merge pull request #1862 from HenryLoenwind/newTooltips
Added Tooltips for item conduit upgrade slots
2015-02-13 16:20:00 -05:00
tterrag1098 95f016ee92 Merge pull request #1907 from MatthiasMann/generator_progress_tooltips
add remaining percentage/time/RF tooltip on stirling generator
2015-02-13 16:18:54 -05:00
tterrag1098 c355defbc8 Merge pull request #1916 from Adaptivity/additlocalization
Localized few tooltips
2015-02-13 16:18:14 -05:00
Adaptivity 50548cae19 Localized few tooltips 2015-02-13 22:19:32 +03:00
Matthias Mann fbb7cec773 add remaining percentage/time/RF tooltip on stirling generator 2015-02-12 00:13:39 +01:00
HenryLoenwind 6f768524cc Added Tooltips for item conduit upgrade slots 2015-02-10 17:35:22 +01:00
Matthias Mann c6ddec37e7 #991 add item filters and range control to vacuum chest 2015-02-08 16:17:33 +01:00
tterrag1098 204b600424 Localize weather crystal 2015-02-07 21:01:42 -05:00
tterrag1098 fb1cd698e8 Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git 2015-02-07 20:29:51 -05:00
tterrag1098 d836f76722 Finish weather obelisk functionality and add configs 2015-02-07 19:34:34 -05:00
tterrag1098 bbd305a0ab Merge remote-tracking branch 'origin/master' into Weather_Obelisk
Conflicts:
	resources/assets/enderio/textures/gui/widgets.png
	src/main/java/crazypants/enderio/gui/IconEIO.java
2015-02-07 17:24:27 -05:00
tterrag1098 52c628a7ab Merge pull request #1870 from HenryLoenwind/solarTooltips
Make Photovoltaic Cell more findable
2015-02-07 17:17:08 -05:00
tterrag1098 a88c7e8ea1 Rename widgets to widgetsv2, add new item textures 2015-02-07 13:30:38 -05:00
HenryLoenwind 2ef8cbb377 Make Photovoltaic Cell more findable
* Photovoltaic Cell now has a common tooltip text
* It says "Solar power" because people search NEI for "solar" not
"photovoltaic"
* Support in TooltipAddera for common tooltips of
IResourceTooltipProviders
* Fixed Advanced Photovoltaic Cell not displaying detailed tooltip text
shared with Photovoltaic Cell in Vanilla tooltip (Waila was ok)
2015-02-07 16:30:45 +01:00
Matthias Mann 28c919ee09 allow shift click on side config button to reset all sides to default 2015-02-07 09:59:59 +01:00
tterrag1098 483a6b1c20 Retexture conduits 2015-02-05 21:07:03 -05:00
tterrag1098 72138026a6 Implement retextured widgets 2015-02-05 20:44:23 -05:00
Mrkwtkr 2d0fddc7da Update zh_CN.lang
I need to learn more about how to squash, sorry for the new PR. :(
2015-02-05 09:19:40 +08:00
tterrag1098 c59f1af40b Merge pull request #1819 from MatthiasMann/issue_1123
#1123 cleanup mod item filter GUI rendering
2015-02-02 16:51:16 -05:00
tterrag1098 3b60517968 Add missing hardened facade textures and recipe 2015-02-01 21:01:05 -05:00
Matthias Mann 903e85cf38 add SAG Mill support for emerald ore similar to diamond ore 2015-02-01 15:30:12 +01:00
Matthias Mann 524b69f00b #1123 cleanup mod item filter GUI rendering 2015-02-01 14:35:16 +01:00
tterrag1098 7c418a2351 #85 Add hardened conduit facade. Also fix hidden facades rendering box 2015-02-01 00:02:41 -05:00
tterrag1098 4f761d5664 #1784 Turns out that blockEnderIo texture is used 2015-01-27 19:15:30 -05:00
Adaptivity 49b5462dc9 Delete unused textures 2015-01-27 13:47:38 +03:00
Adaptivity dbf38c7a47 Localize GUIs 2015-01-26 17:08:52 +03:00
Adaptivity 1df6f408bd As @MatthiasMann requested 2015-01-25 16:28:32 +03:00
Adaptivity 78d612a1fc Localized Existing Item Filter buttons 2015-01-25 16:09:33 +03:00
tterrag1098 09cc619b9b Merge pull request #1762 from MatthiasMann/sliceAndSplice_gui
align the progress arrow and output slot with the input slots
2015-01-24 15:47:34 -05:00
Matthias Mann 931be1bd62 align the progress arrow and output slot with the input slots 2015-01-24 21:45:40 +01:00
tterrag1098 334a416f8a Merge pull request #1750 from MatthiasMann/speed_downgrade
#746 added speed downgrade to item conduit
2015-01-24 15:40:14 -05:00
Matthias Mann 259ccdd1b8 #746 added speed downgrade to item conduit 2015-01-24 21:26:33 +01:00
tterrag1098 9b0aec5bb1 Merge pull request #1738 from Adaptivity/localizewailaandtooltips
Localized waila and tooltips
2015-01-24 14:33:32 -05:00
tterrag1098 9e0094710a Merge pull request #1752 from MatthiasMann/gui_progress_tooltips
#1731 Add progression percentage tooltip to machines
2015-01-24 14:33:19 -05:00
Matthias Mann c6fe880ef0 fixed enchanter tooltip line numbers, display yeta wrench detailed tooltip as detailed 2015-01-24 18:30:09 +01:00
Adaptivity b06c6d17c4 Some more localization 2015-01-24 18:36:18 +03:00
Matthias Mann e8ca0c1067 #1731 Add progression percentage tooltip to machines 2015-01-24 15:12:45 +01:00
tterrag1098 89ff8d2af4 Move unused icons to "old" folder 2015-01-23 17:06:59 -05:00
Adaptivity 27e3288655 Localized waila and tooltips 2015-01-23 19:51:38 +03:00
tterrag1098 85fbb438bd Whoops, forgot the new texture 2015-01-22 10:44:52 -05:00
tterrag1098 cb364ed831 Add button art, particles/progress bar are now colored per task. 2015-01-21 19:22:33 -05:00
tterrag1098 938f5db503 Merge branch 'master' into Weather_Obelisk 2015-01-21 16:42:28 -05:00
tterrag1098 5540204afe Merge pull request #1719 from MatthiasMann/forestry_armor_upgrades
#1703 added Forestry upgrades to the Dark Steel Armor
2015-01-21 16:15:45 -05:00
Matthias Mann 1a35e6df71 #1703 added Forestry upgrades to the Dark Steel Armor 2015-01-21 22:13:11 +01:00
tterrag1098 717fc0436d Work on weather obelisk GUI, now has a texture and animates 2015-01-20 18:23:21 -05:00
tterrag1098 b2442d7849 Fix glass sides not rendering when a different type is placed against it 2015-01-19 20:13:05 -05:00
tterrag1098 aaee449a70 Merge pull request #1706 from MatthiasMann/soulvial_sheeps
display sheep color in soul vial tooltip
2015-01-19 13:31:42 -05:00
tterrag1098 d295aa8f92 Merge pull request #1715 from MatthiasMann/enderfluid_blacklist
added blacklist option to ender fluid conduits
2015-01-19 13:31:29 -05:00