upstream/EnderIO
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/EnderIO.git synced 2026-10-25 20:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,482 Commits 12 Branches 241 Tags
0ed258ee8c78d98c43954171d76ec8ffb33472cf
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
tterrag1098 0ed258ee8c Update release notes 2015-02-04 22:05:27 -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
tterrag1098 740b7597ac Merge pull request #1848 from Mrkwtkr/patch-3 
Update zh_CN.lang
 2015-02-04 20:43:17 -05:00
tterrag1098 ba0fe8a0a2 Merge pull request #1846 from MatthiasMann/wireless_nbt 
let the wireless charger keep it's stored energy when picked up
 2015-02-04 15:18:59 -05: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
tterrag1098 34f4d53f75 Merge pull request #1838 from MatthiasMann/yetawrench 
don't break conduits with the yeta wrench on left click
 2015-02-03 16:10:10 -05: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 6e1032d0c8 Update version to 2.2.8 and update release notes 2015-02-02 20:29:15 -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 4824d3fddc Update forge to latest 2015-02-02 19:02:16 -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
tterrag1098 118e80209c Merge pull request #1826 from MatthiasMann/issue_1824_1825 
#1824 #1825 use getMaxStackSize
 2015-02-02 13:51:24 -05: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 48d39813f5 Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git 2015-02-01 20:04:13 -05:00
tterrag1098 7813023c73 Merge pull request #1820 from MatthiasMann/sagmill_emeraldore 
add SAG Mill support for emerald ore similar to diamond ore
 2015-02-01 22:51:55 -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
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 e505570c8d Add API javadoc exporting to buildscript 2015-01-31 19:34:49 -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
tterrag1098 964291abe5 Merge pull request #1812 from MatthiasMann/issue_1810 
#1810 use the right math helper
 2015-01-30 15:22:43 -05:00
tterrag1098 6f1163f774 Merge pull request #1799 from MatthiasMann/soulbinder_update 
update task progress at least once per second
 2015-01-29 13:47:12 -05:00
tterrag1098 48b46db178 Fix held itemstack being "moved" when held over IO config 2015-01-29 13:35:55 -05:00
tterrag1098 a605736710 Fix tooltips rendering under IO config, also fix changing NEI lighting 2015-01-29 13:15:26 -05:00
tterrag1098 33645ccf48 Merge pull request #1695 from DarkStarDS9/master 
Different Item-Place-Logic
 2015-01-27 23:51:08 -05:00
tterrag1098 bf211db416 Wither skeletons will now drop necrotic bones and respect beheading 2015-01-27 23:28:25 -05:00
tterrag1098 c9946e21ec Fix wither skeletons not spawning and fix their equipment/rendering 2015-01-27 22:57:32 -05:00
tterrag1098 4b8c8ba919 #1771 Add single UUID to share between killer joes 2015-01-27 22:09:52 -05:00
tterrag1098 35324eaab0 #1745 Add support for sending grinding balls via IMC 2015-01-27 19:53:50 -05:00
tterrag1098 c8090b04f0 Fix IItemDuct methods on item conduit ignoring filter settings 2015-01-27 19:26:35 -05:00
tterrag1098 4f761d5664 #1784 Turns out that blockEnderIo texture is used 2015-01-27 19:15:30 -05:00
tterrag1098 6ba328d6fa Merge pull request #1790 from MatthiasMann/issue_1789 
#1789 added null check for entityPlayer
 2015-01-27 18:49:53 -05:00
tterrag1098 35c13a0650 Merge pull request #1779 from MatthiasMann/meconduit_fixes 
ME counduits should now behave better
 2015-01-27 18:48:59 -05:00
tterrag1098 ec46f22dc2 Update AE2 API 2015-01-27 18:17:46 -05:00
tterrag1098 1bdff03d5b Merge pull request #1791 from Adaptivity/unused 
Delete unused textures
 2015-01-27 11:15:13 -05:00
tterrag1098 70414febab Merge pull request #1783 from Adaptivity/ultramegamuchmoregreaterlocalization 
Localize GUIs
 2015-01-27 00:14:48 -05:00
tterrag1098 0e997bb295 Merge pull request #1772 from Adaptivity/localizeexistingitemfilter 
Localized Existing Item Filter buttons
 2015-01-25 20:25:27 -05:00
tterrag1098 75f0d45000 Merge pull request #1769 from MatthiasMann/itemfilter_doublechests 
#1768 improve double chest support for existing item filter's snapshot/m...
 2015-01-24 22:16:53 -05: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
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
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
tterrag1098 a201b48dc0 Fix conduit facades not showing break animation 2015-01-23 17:47:46 -05:00
tterrag1098 89ff8d2af4 Move unused icons to "old" folder 2015-01-23 17:06:59 -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
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 85fbb438bd Whoops, forgot the new texture 2015-01-22 10:44:52 -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
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 0efc6312dd Update release notes and version. 2.2.7. 2015-01-19 22:01:12 -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
tterrag1098 a98058fba1 Merge pull request #1717 from Adaptivity/Localizeneiandkeys 
Localized NEI and Keybinds
 2015-01-19 13:31:20 -05: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
tterrag1098 d065148abf Merge pull request #1692 from LorenzoDCC/master 
pt_BR translations and shtuff
 2015-01-18 16:29:35 -05:00
tterrag1098 feba3e78c3 Merge pull request #1702 from MatthiasMann/tank_bucket_issue 
#1701 - ignore side config for interaction with buckets
 2015-01-18 16:28:15 -05: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
tterrag1098 d356bb18c1 Merge pull request #1693 from MatthiasMann/itemfilter_tooltip 
fixed missing tooltip for chargeable item filter upgrade
 2015-01-16 21:48:04 -05: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
tterrag1098 80015c1d7b Merge pull request #1677 from Parker8283/IMC 
Process IMCs from mods who send them in PostInit
 2015-01-14 19:16:56 -05:00
tterrag1098 a59f0e2487 Merge pull request #1669 from MatthiasMann/master 
use a block access wrapper to correctly render Extra Utilities' colored ...
 2015-01-13 18:22:32 -05:00
tterrag1098 e2878ac24e Merge pull request #1659 from SniperElisia/patch-1 
Update ko_KR.lang
 2015-01-13 14:45:27 -05:00
tterrag1098 d4b9231ce6 Merge pull request #1667 from Adaptivity/update 
Fixed authorList in mcmod.info
 2015-01-13 14:45:19 -05:00
tterrag1098 3a71e193ac #1657 Remove caching of IIcons in soul binder renderer. 2015-01-13 01:09:10 -05:00
tterrag1098 1e4eedb5b2 Update to Waila 1.5.8 2015-01-12 23:10:55 -05:00
tterrag1098 0e7145c23f Merge pull request #1653 from MatthiasMann/master 
provide fluid conduit information in Waila
 2015-01-12 17:22:12 -05:00
tterrag1098 b9628e7294 Merge pull request #1644 from MatthiasMann/master 
fix pushing out empty buckets from stirling gen
 2015-01-11 19:05:00 -05:00
tterrag1098 1101a8073f Merge pull request #1592 from hilburn/master 
Unique Wither Skeleton Entity
 2015-01-10 19:18:24 -05:00
tterrag1098 df483c1a59 Merge pull request #1636 from MatthiasMann/master 
Fix buffer IO mode handling - #1627
 2015-01-10 19:18:11 -05:00
tterrag1098 a68fd3e450 Merge pull request #1605 from MatthiasMann/master 
added MagicCrops' hoes to default whitelist
 2015-01-10 10:33:02 -05:00
tterrag1098 90938074e3 Merge pull request #1621 from MatthiasMann/cap_bank 
support rendering of larger IO labels
 2015-01-10 10:20:26 -05:00
tterrag1098 00bdd12bda Merge pull request #1629 from MatthiasMann/energy_filter 
added chargeable item filter - part of #1330
 2015-01-10 10:06:25 -05:00