Commit Graph
1262 Commits
Author SHA1 Message Date
Adaptivity 78d612a1fc Localized Existing Item Filter buttons 2015-01-25 16:09:33 +03:00
Matthias Mann 8db386c626 #1768 improve double chest support for existing item filter's snapshot/merge operation 2015-01-25 04:10:06 +01: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
tterrag1098 ac0874dd71 Merge pull request #1757 from MatthiasMann/tooltip_fixes
fixed enchanter tooltip line numbers, display yeta wrench detailed toolt...
2015-01-24 14:32:26 -05:00
tterrag1098 8f5ee6e084 Merge pull request #1748 from MatthiasMann/painted_slab_drop_creative
don't drop painted slabs in creative mode
2015-01-24 14:32: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
Matthias Mann 4f1faad4f1 don't drop painted slabs in creative mode 2015-01-24 10:38:02 +01:00
tterrag1098 a201b48dc0 Fix conduit facades not showing break animation 2015-01-23 17:47:46 -05:00
tterrag1098 9c639f59fa #1742 Fix "dead" entities being still attacked by the killer joe 2015-01-23 15:47:44 -05:00
tterrag1098 3cb8da4e87 #1662 add interfaces to control hiding conduits and display modes 2015-01-23 13:33:04 -05:00
Adaptivity 27e3288655 Localized waila and tooltips 2015-01-23 19:51:38 +03:00
tterrag1098 83eee6beb0 Some more default hoes 2015-01-23 00:07:35 -05:00
tterrag1098 1a3a0c6bcc Add world wrapper to waila, should fix sneaky facades 2015-01-22 13:44:05 -05:00
tterrag1098 3a1da27d3c Split internal and external connector textures 2015-01-22 10:44:12 -05:00
tterrag1098 b60a44fe7a Conduit connectors should now combine into a single box (experimental) 2015-01-22 09:48:30 -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 de2459696f move dark steel item instances into it's own statis class to solve class loading order dependencies 2015-01-21 22:13:18 +01:00
Matthias Mann 1a35e6df71 #1703 added Forestry upgrades to the Dark Steel Armor 2015-01-21 22:13:11 +01:00
tterrag1098 243843aff2 Add hashCode to CollidableComponent just to be safe 2015-01-21 00:55:32 -05:00
tterrag1098 2c19fe16b7 Adjust all renderers to support break overlay 2015-01-21 00:52:56 -05:00
tterrag1098 471f665351 Fix crash with iguana tweaks level ups 2015-01-20 22:37:04 -05:00
tterrag1098 9c7f671e14 #1643 Ender Rails break instantly 2015-01-19 20:37:28 -05:00
tterrag1098 fd3064cf17 #1640 Soulbound has ridiculous values for enchantability 2015-01-19 20:32:39 -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
Adaptivity cca20690a9 Localized NEI and Keybinds 2015-01-19 20:56:28 +03:00
Matthias Mann 738b12d2be added blacklist option to ender fluid conduits 2015-01-19 00:53:59 +01:00
Matthias Mann ad6ef78320 display sheep color in soul vial tooltip 2015-01-18 22:47:04 +01:00
tterrag1098 e70875c0ef Merge pull request #1686 from MatthiasMann/master
show upgrade information in Stirling generator GUI when the upgrade slot is empty
2015-01-18 16:31:27 -05:00
Matthias Mann 35c4380d0f #1701 - ignore side config for interaction with buckets 2015-01-17 14:56:49 +01:00
Matthias Mann 5e1d82e0e9 show upgrade information in Stirling generator GUI when the upgrade slot is empty 2015-01-17 10:33:48 +01:00
tterrag1098 9d0450219e Merge pull request #1689 from MatthiasMann/sagmill_grindingball
simplify grinding ball synchronization and fix wrong display (issue #1673)...
2015-01-16 21:55:56 -05:00
tterrag1098 f0242f1fec Merge pull request #1690 from MatthiasMann/enderfluidconduit_copypaste
move redstone mode handling for conduit probe into fluid conduit base class - fixes #1655
2015-01-16 21:52:43 -05:00
tterrag1098 56b697d684 Merge pull request #1691 from MatthiasMann/gui_tooltip_locations
adjust tooltip location when moving a button - fixes #1609
2015-01-16 21:51:32 -05:00
Matthias Mann 66b5603138 fixed missing tooltip for chargeable item filter upgrade 2015-01-16 08:28:42 +01:00
Matthias Mann 28a5189223 adjust tooltip location when moving a button - fixes #1609 2015-01-16 01:37:03 +01:00
Matthias Mann 2ebb92c061 move redstone mode handling for conduit probe into fluid conduit base class - fixes #1655 2015-01-16 01:21:29 +01:00
Matthias Mann e7386f412a simplify grinding ball synchronization and fix wrong display (issue #1673) when switching between different grinding ball types 2015-01-16 00:49:26 +01:00
tterrag1098 2f98cba0eb Merge pull request #1674 from MatthiasMann/master
display power generation for fuel items in sterling gen UI, fixed painted slabs light calculation
2015-01-15 02:29:11 -05:00
Parker Young d049fd9d9c Process IMCs from mods who send them in PostInit 2015-01-14 19:13:36 -05:00
Matthias Mann 75e077e82a fixed light calculation of painted slabs to match vanilla slabs 2015-01-14 20:33:12 +01:00
Matthias Mann 2358498dae show how much power is generated for a fuel item inside a Stirling generator 2015-01-14 20:32:32 +01:00