Commit Graph
1339 Commits
Author SHA1 Message Date
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 a88c7e8ea1 Rename widgets to widgetsv2, add new item textures 2015-02-07 13:30:38 -05:00
tterrag1098 47ee2a7099 Add WAILA min version 2015-02-07 13:30:19 -05:00
tterrag1098 d3edb1dbf2 Actually fix WAILA issues. Use serverside NBT hook instead of synced key 2015-02-07 13:14:44 -05:00
tterrag1098 e93744dd37 Merge pull request #1861 from HenryLoenwind/tooltips
* Fixed tooltip position
2015-02-07 12:27:38 -05:00
tterrag1098 0c77fd1319 Merge pull request #1864 from MatthiasMann/clear_sideconfig
allow shift click on side config button to reset all sides to default
2015-02-07 12:27:11 -05:00
HenryLoenwind c819c0db41 Fixed WAILA tooltip of photo cell
* Energy storage is no longer added twice to the tooltip
2015-02-07 17:02:52 +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
HenryLoenwind 1fe8acc000 * Fixed tooltip position
* Tooltip for "Priority" field in item conduit GUI was off
2015-02-06 17:13:56 +01:00
tterrag1098 87d7701ec0 Merge remote-tracking branch 'origin/2.2.8' 2015-02-05 21:27:51 -05:00
tterrag1098 9f26921537 Fix painted glowstone and lights dropping the wrong items 2015-02-05 21:23:33 -05: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
Katrina Swales f628b988de Made endermen heads act as Thaumcraft infusion stabilisers 2015-02-05 23:02:37 +01:00
tterrag1098 4a782d1eff Revert change to new pick block method to keep compat with cauldron 2015-02-05 01:58:36 -05:00
tterrag1098 d09cf305fc #1851 Add hard dep on forge 1234 2015-02-05 01:53:15 -05:00
tterrag1098 49523db9be Fix mod tools not hiding facades 2015-02-04 22:25:15 -05:00
tterrag1098 eb8c8f5c13 Add code to remove default WAILA RF tooltips, waiting on fix from WAILA 2015-02-04 21:59:38 -05:00
tterrag1098 21c3613260 #1844 Fix WAILA plugin world wrapper not properly handling isRemote 2015-02-04 21:43:00 -05:00
tterrag1098 0b42a1240d Merge pull request #1847 from MatthiasMann/conduit_gui_nei_overlap
hide NEI items under EIO GUI tabs
2015-02-04 20:44:44 -05:00
Matthias Mann 8bd0310e96 hide NEI items under EIO GUI tabs 2015-02-04 23:04:18 +01:00
Matthias Mann 3c4c153ad3 let the wireless charger keep it's stored energy when picked up 2015-02-04 20:08:58 +01:00
tterrag1098 10af591cee Fix capacitor banks not saving to itemstacks 2015-02-04 12:25:38 -05:00
tterrag1098 961e263be5 Merge pull request #1839 from MatthiasMann/alloysmelter_achievements
give achievements for smelting iron and cooking fish in the alloy smelter
2015-02-03 19:26:33 -05:00
tterrag1098 5f88a1f690 Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git 2015-02-03 19:22:33 -05:00
tterrag1098 d3417225d1 Finish refactoring wrenching/itemdrops into base classes.
Also fix conduits not rendering break texture
2015-02-03 19:22:24 -05:00
Matthias Mann 7e9cd45f52 give achievements for smelting iron and cooking fish in the alloy smelter 2015-02-03 20:27:23 +01:00
Matthias Mann 17930325aa don't break conduits with the yeta wrench on left click 2015-02-03 19:27:28 +01:00
tterrag1098 01194de240 Fix infinite loop on vacuum chest NBT read/write 2015-02-02 23:10:42 -05:00
tterrag1098 e35874cc10 Remove crap. Literally. 2015-02-02 20:43:18 -05:00
tterrag1098 25dff28320 Add upgrade recipe for vibrant capacitor 2015-02-02 20:12:59 -05:00
tterrag1098 98145a9ca0 Merge pull request #1828 from MatthiasMann/capbank_upgrade_recipe2
add recipe handler to upgrade basic to normal capacitor banks
2015-02-02 19:34:56 -05:00
tterrag1098 a59446b904 Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git 2015-02-02 18:23:19 -05:00
tterrag1098 d9863b7a2e Refactor how blocks drop into the base Block/TE class. Fixes drop issues 2015-02-02 18:23:09 -05: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
Matthias Mann 569c92db49 add recipe handler to upgrade basic to normal capacitor banks 2015-02-02 22:08:40 +01:00
Matthias Mann ef1f2441e5 #1824 #1825 use getMaxStackSize 2015-02-02 19:45:28 +01:00
tterrag1098 3b60517968 Add missing hardened facade textures and recipe 2015-02-01 21:01:05 -05:00
tterrag1098 3cb5b56fc0 #1821 buffers ignoring redstone checks 2015-02-01 20:12:02 -05:00
tterrag1098 85679e91c5 #1818 Dimensional Transceiver dupe, fix machines dropping in creative 2015-02-01 20:04:07 -05:00
tterrag1098 45264f0527 Fix old NBT data on conduits crashing 2015-02-01 15:33:18 -05: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 0b3000cdec #1585 Fix blocks not dropping in explosions 2015-01-31 21:35:39 -05:00
tterrag1098 a2d1ff36e0 Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git 2015-01-31 20:51:41 -05:00
tterrag1098 ab40c70003 #1630 "Fix" item conduits preserving invalid stack sizes 2015-01-31 20:51:35 -05:00
tterrag1098 0d490edc46 Merge pull request #1811 from MatthiasMann/wireless_optimizations
cache which wireless chargers are in range of a TE
2015-01-31 20:28:50 -05:00
tterrag1098 1a1829a26f Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git 2015-01-31 19:00:27 -05:00
tterrag1098 11c51a7ef6 Fix timer reflection not working out of dev, also fix up Log class 2015-01-31 19:00:22 -05:00