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
3,960 Commits 12 Branches 241 Tags
master
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CrazyPants 11e874b89e Merge pull request #3601 from HenryLoenwind/genStall 
Backport: Prevent generators from stalling if they are configured to produce more RF/t than normal
 2016-08-11 18:15:23 +08:00
CrazyPants a4cfb9fdf1 Merge pull request #3393 from tytannial/master 
Update zh_CN.lang and add missing localization strings.
 2016-06-21 21:05:38 +08:00
CrazyPants f66ccef5dc Merge pull request #3163 from HenryLoenwind/magnetPower 
Prevent magnet from being used as battery by default
 2016-05-29 00:25:33 +08:00
CrazyPants 8f05a8a48a Merge pull request #3309 from OneEyeMaker/TelePad 
Added config options for TelePad
 2016-05-29 00:22:58 +08:00
CrazyPants fa4afebca2 Merge pull request #3081 from HenryLoenwind/farmLoaded 
Check if chunk is loaded in farming station
 2016-05-29 00:21:46 +08:00
CrazyPants eb906440ea Merge pull request #3164 from HenryLoenwind/baublesCrash 
Handle Baubles inv more careful in MP
 2016-05-29 00:20:54 +08:00
CrazyPants 54ea6abbca Merge pull request #3210 from 3TUSK/zhCN-correction 
Update zh_CN.lang
 2016-05-29 00:20:09 +08:00
CrazyPants 4c2f928db1 Merge pull request #3263 from HenryLoenwind/magicalHoe 
Added new Magic Crops hoe names
 2016-05-29 00:19:39 +08:00
CrazyPants 3ab75b2f09 Merge pull request #3287 from MaPePeR/implement1984 
Show Block Name in GuiExternalConnectionSelector. Fixes #1984
 2016-05-29 00:18:54 +08:00
CrazyPants 2d9a21ef1c Merge pull request #3303 from HenryLoenwind/noPort 
Side-hardened IMC processing
 2016-05-29 00:17:47 +08:00
CrazyPants 00f523cb72 Merge pull request #3289 from HenryLoenwind/reverseDistributer 
Fixed PowerDistributor distributing power backwards
 2016-05-28 15:46:06 +08:00
CrazyPants 19f419d59e Merge pull request #2921 from HenryLoenwind/magnet438 
Reworked the magnet code
 2016-01-24 21:32:20 +08:00
CrazyPants 0b33be0e20 Merge pull request #2891 from HenryLoenwind/mvn 
Allow "gradle install" to install into local Maven repo
 2016-01-24 21:23:02 +08:00
CrazyPants 85ba17e4e9 Merge pull request #3074 from HenryLoenwind/burnYou 
Made Stirling Generator more configurable
 2016-01-24 21:07:51 +08:00
CrazyPants 014999a2a6 Merge pull request #2893 from HenryLoenwind/easter 
Removed Herobrine
 2016-01-24 20:57:14 +08:00
CrazyPants 6cca8c9035 Merge pull request #2959 from Xyxen/fix-comparators 
Fix zero comparator signal on near-empty storage
 2016-01-24 20:55:36 +08:00
CrazyPants 1ea88177d6 Merge pull request #2938 from HenryLoenwind/blackmods 
Added blacklist feature to the mod item filter
 2016-01-24 20:53:49 +08:00
CrazyPants 6aac56902d Merge pull request #3073 from HenryLoenwind/hurtYou 
Add options for Killer Joe on a non-PvP server
 2016-01-24 20:47:09 +08:00
CrazyPants 42d23e6cb6 Merge pull request #3090 from HenryLoenwind/magicalShearings 
Fixes for shears
 2016-01-24 20:44:19 +08:00
CrazyPants 3da4f68051 Merge pull request #3131 from Mexahoid/patch-1 
Update ru_RU.lang
 2016-01-24 20:43:50 +08:00
CrazyPants 46ea7ba622 Merge pull request #3137 from claybiockiller/master 
Update zh_CN.lang
 2016-01-24 20:43:16 +08:00
CrazyPants a304f104e3 Merge pull request #3148 from HenryLoenwind/glowMeta 
Keep meta when dropping painted glowstone as item
 2016-01-24 20:42:20 +08:00
CrazyPants 3c17cecfff Merge pull request #3149 from HenryLoenwind/renderHole 
Try to prevent render errors from non-solid painted blocks
 2016-01-24 20:41:16 +08:00
CrazyPants 238952148d Merge pull request #3158 from HenryLoenwind/wheelie 
Allow both Yeta Wrench mouse actions to be off
 2016-01-24 20:38:48 +08:00
CrazyPants f3ba01ab26 Added villager. Will only be available if ender structures is installed. 2016-01-01 21:22:44 +08:00
CrazyPants 674dc78b6d Merge pull request #2496 from MatthiasMann/conduitgui_hide_functionupgrade 
only show function upgrade slot when either input or output slots are…
 2015-05-23 21:51:19 +08:00
CrazyPants 36db1d4537 Merge pull request #2495 from MatthiasMann/invpanel_shiftclick_desync 
try to combat Minecraft's transferStackInSlot desync issue
 2015-05-23 21:51:03 +08:00
CrazyPants 74d4b8683d Merge pull request #2176 from HenryLoenwind/crash 
Add our take on unsupported mods to the crash report
 2015-05-22 10:39:15 +08:00
CrazyPants 2a8d5367f7 Merge pull request #2253 from eduardog3000/barley 
Add Natura Barley to Flour SAG Mill recipe.
 2015-05-21 22:38:23 +08:00
CrazyPants dd2fb28b60 Merge pull request #2484 from MatthiasMann/invpanel_keep_lists_in_sync 
also clear requestedItems when clientItems is cleared
 2015-05-21 22:32:54 +08:00
CrazyPants 8deff082af Merge pull request #2483 from MatthiasMann/itemconduit_shiftclick_upgrades 
allow shift clicking item conduit upgrades (filters, speed, etc)
 2015-05-21 22:31:34 +08:00
CrazyPants 8af8274155 Merge pull request #2482 from MatthiasMann/dark_glass 
#2479 Dark Glass
 2015-05-21 22:28:56 +08:00
CrazyPants 269523efe4 Merge pull request #2059 from HenryLoenwind/fix 
Remove Debugging Code
 2015-03-07 21:13:22 +08:00
CrazyPants 94eda5f5c1 Release 2.2.4 2014-12-16 17:35:13 +08:00
CrazyPants 131f3c2572 Added IMC support for defining if a block or tile entity should be connected to by insulated redstone conduits 2014-12-16 17:33:10 +08:00
CrazyPants 5e43537ee2 #1413 Added support for Dense Ores in SAG Mill and Alloy Furnace 2014-12-16 17:13:41 +08:00
CrazyPants 370f783373 #1421 Capacitor bank wont pull energy from a dim. transceiver 2014-12-16 15:58:06 +08:00
CrazyPants 898fc01509 #1423 Crash using 'show range' button in aversion / attractor obelisk 2014-12-16 12:33:47 +08:00
CrazyPants c0ec750ae4 #1412 Nullpointer Exception in console 2014-12-15 21:22:28 +08:00
CrazyPants b885de7765 #1409 Energy conduit and capacitor interaction bug 2014-12-15 21:03:05 +08:00
CrazyPants 5a4598fe5d Merge branch 'master' of https://github.com/CrazyPants/EnderIO 2014-12-15 20:36:34 +08:00
CrazyPants 7e8526561b Fixed infinite power bug 2014-12-15 20:36:15 +08:00
CrazyPants 166cc4e659 Merge branch 'master' of https://github.com/CrazyPants/EnderIO 2014-12-15 12:58:23 +08:00
CrazyPants 1e57ed0733 Re-implemented power upgrade tooltip to work around very odd bug. 2014-12-15 12:58:05 +08:00
CrazyPants ef34daa6c4 Updated version to 2.2.3 2014-12-15 12:12:59 +08:00
CrazyPants a7dac86a74 #1403 Removed dust version of the enderium base recipe. 2014-12-14 21:47:37 +08:00
CrazyPants d4b5fd5a61 #1397 Completed refactor splitting machines into no powered, power receivers, power generators and power handlers (power in and out) 2014-12-14 18:49:38 +08:00
CrazyPants 10c928591e #1401 Crash when opening Vat GUI 2014-12-14 17:34:49 +08:00
CrazyPants 0a7220e578 Ender Fluid Conduit filters and auto extract can now be used when in/out mode 2014-12-13 21:37:05 +08:00
CrazyPants 7efe4a6682 Added 'show range' button to Attractor Obelisk 2014-12-13 19:53:56 +08:00
CrazyPants e2b1f6f4ca Fixed rendering of Zombie Gen bubbles and fluid plus fixed which pass facades are rendered in. 2014-12-13 19:08:13 +08:00
CrazyPants 26c8cf6c76 #1390 #1393 EIO machines and generators now implement only IEnergyReciver or IEnergyProvider instead of IEnergyHandler where appropriate 2014-12-13 15:55:54 +08:00
CrazyPants b6bee1a3fb Merge branch 'master' of https://github.com/CrazyPants/EnderIO 2014-12-13 14:43:07 +08:00
CrazyPants 4b4c70a270 #1354 Fixed fix 2014-12-13 14:42:46 +08:00
CrazyPants efb15c542a Merge branch 'master' of https://github.com/CrazyPants/EnderIO 2014-12-13 12:57:03 +08:00
CrazyPants 170b0287f7 Reverted ME conduit fix until more testing is done 2014-12-13 12:56:45 +08:00
CrazyPants 72614cebdc Dimensional Transceiver can now be configured to buffer either single items or item stacks 2014-12-12 23:03:49 +08:00
CrazyPants 98bb502ac8 Crafter can now be configured to buffer either single items or item stacks 2014-12-12 22:18:34 +08:00
CrazyPants 99e1fac73b Capacitor Bank fill bars are now automatically extended when placing new blocks. 2014-12-12 18:05:23 +08:00
CrazyPants fb7620be02 Farm and Dark Steel Axe where having non target trees with adjacent log blocks 2014-12-12 17:46:58 +08:00
CrazyPants 1531f9c639 Removed unused code. 2014-12-12 17:34:47 +08:00
CrazyPants f1189ff65b Dark Steel Pick will now apply the obsidian efficiency boost on all hard blocks (can be changed in the config) 2014-12-12 16:43:17 +08:00
CrazyPants d934d59cbd Fixed crash with ME conduit fix. 2014-12-12 15:42:48 +08:00
CrazyPants a4f0e68cb9 #1354 ME conduit always connected regardless of visual state 2014-12-12 15:08:34 +08:00
CrazyPants 52302bbac3 #1371 Farming Stations don't harvest third/top block of sugar cane or cactus 2014-12-12 14:36:23 +08:00
CrazyPants 85533e2e9a Stopped onUpdate from being called on enderman skulls 2014-12-12 14:24:33 +08:00
CrazyPants a2cec66a81 #1384 Disabling one side of machines disables the opposite side as well. 2014-12-12 14:09:32 +08:00
CrazyPants 9c72b9ec5a Added Soul Bound enchantment ID to the config 2014-12-12 13:26:32 +08:00
CrazyPants 6f459cda53 #1285 Ender Rail not adjusting the direction of RC locomotives when required 2014-12-12 00:31:00 +08:00
CrazyPants 965a891b2f #1285 Disabled rotation of ender rail 2014-12-11 23:32:50 +08:00
CrazyPants c9ce9cf21d Fixed crash when removing TE from an existing world. 2014-12-11 21:39:03 +08:00
CrazyPants 081cd1d0a1 #1335 Dimensional Transceivers not saving channels after server restart 2014-12-11 20:58:20 +08:00
CrazyPants 4e5a985f24 #1378 Soul Vial filled in a Powered Spawner now produce identical item stacks to enable their use in auto crafting systems 2014-12-11 15:20:41 +08:00
CrazyPants 5cc63eacf6 #1383 Travel Anchor crash 2014-12-11 13:43:13 +08:00
CrazyPants 4b32659dc1 Capacitor Banks can now be used to add the Flux upgrade to TiC tools 2014-12-10 23:06:34 +08:00
CrazyPants ac031de948 Updated release notes 2014-12-10 22:41:32 +08:00
CrazyPants 8766096882 Merge branch 'master' of https://github.com/CrazyPants/EnderIO 2014-12-10 22:37:20 +08:00
CrazyPants 79e408d330 Added support for increased Enderman Skull drops when using a TiC Cleaver or weapon with the beheading modifier 
Halved the skull drop chance when mobs killed by a 'fake player', such as killer joe (can be changed in the config)
 2014-12-10 22:37:01 +08:00
CrazyPants 2f63484cc5 Increased mining level of Dark Steel Pick so it can mine TiC Cobalt and Ardite ore 2014-12-10 20:32:42 +08:00
CrazyPants b1f7d93954 Added alloy smelter recipe for Fluxed Electrum 2014-12-10 20:30:31 +08:00
CrazyPants c7d561c9b0 Fixed rendering of non-painted travel anchors. 2014-12-10 17:16:31 +08:00
CrazyPants bbf050f3bf RF Tools not charging in Killer Joe until he has attacked something 2014-12-10 17:10:19 +08:00
CrazyPants a11279c51c Painted items are now rendered with a border to make it easier to tell them from the paint source blocks 
Painted glow stone hardness increased to stop instant breaking
 2014-12-10 16:52:50 +08:00
CrazyPants 38c5ef9b36 #1377 Crash with latest release when checking Alloy smelter recipes 2014-12-10 12:39:46 +08:00
CrazyPants aa71e2c0ec Better? 2014-12-10 03:21:32 +08:00
CrazyPants 9dcf00b777 Fixed sulfor ore recipe 2014-12-09 23:29:53 +08:00
CrazyPants 8c5d3abc40 Improved recipe support for Thermal Foundation/Expansion in the SAG Mill and Alloy Smelter 2014-12-09 21:27:21 +08:00
CrazyPants 25169811df Added preferences for Ore Dictionary outputs for the SAG Mill and Alloy Furnace. Defaults to Thermal Foundation when available, see OreDictionaryPreferences_Core.xml 2014-12-09 19:03:55 +08:00
CrazyPants da7ff462b6 Fixed fill bars on cap banks not updating. 2014-12-09 18:14:03 +08:00
CrazyPants 85efebded5 Added ability to specify preferences for OreDictionary outputs from the SAG Mill 2014-12-09 17:51:15 +08:00
CrazyPants 57191de651 Corrected Experience Obelisk tooltip 2014-12-09 16:16:28 +08:00
CrazyPants 8267b3f755 Merge branch 'master' of https://github.com/CrazyPants/EnderIO 2014-12-09 16:12:35 +08:00
CrazyPants 80d31c632f SAG Mill no longer produces dusts for metals that are not available 
Added config option to add Ore Dictionary entries and registered names to tooltips (default is off)
 2014-12-09 16:12:15 +08:00
CrazyPants 0e5f14984a #1366 Powered Spawners don't remain active with chunk loaders 2014-12-09 00:16:17 +08:00
CrazyPants 90fd5dcd02 #1333 Sound locator sometimes creates thousands of entities per frame 
Sound locator entities not being rendered in some cases
 2014-12-08 21:26:09 +08:00
CrazyPants 7422bcd2c2 #1339 SAG Mill grinding balls reducing return rate for bonus outputs 2014-12-08 20:44:10 +08:00
CrazyPants f49facf751 #1361 Enlightened Fused Quartz is not blast resistant 2014-12-08 19:45:57 +08:00
CrazyPants 701cabeebf #1363 Two bugs with the new Vibrant Capacitor 2014-12-08 19:37:29 +08:00
CrazyPants ee7067016d #1347 Capacitor Bank energy duplication bug. 2014-12-06 21:19:23 +08:00
CrazyPants 896b527485 #1357 Power Conduits replaced by growing tree's 2014-12-06 21:12:17 +08:00