Commit Graph
3572 Commits
Author SHA1 Message Date
Zoko061602 4e9b00702a Added Big Item Filter 2020-04-02 14:13:47 +02:00
Zoko061602 0d00ff00cb Fixed Conduit Filter 2020-04-02 13:43:51 +02:00
Zoko061602 30befc896c Fixed Armor again 2020-03-14 13:01:08 +01:00
Zoko061602 805ba22e52 Fixed Armor & new Conduit texture 2020-03-13 22:07:16 +01:00
Zoko061602 ab0de22156 Fixed Upgrades 2020-03-12 21:51:15 +01:00
Zoko061602 06d0749766 Fixed missing localization 2020-02-08 21:33:51 +01:00
Zoko061602 fb64552ca4 Added more 1.12 content
- Added Generators
- Added Fluids
- made grindingBalls seperate Items
- Added solar Panel 3
2020-02-08 03:20:54 +01:00
Zoko061602 548d8d3d17 Add EndSteel Armor
- Added EndSteel Armor
- Added Capacitor
- Added Empowered 5
2020-02-05 01:25:27 +01:00
Zoko061602 3ae96b3f35 Added Grinding Balls and End Steel 2020-02-03 22:38:49 +01:00
Martin Robertz d05257522e Merge pull request #5 from GTNewHorizons/revert-4-patch-3
Revert "Allow Galacticraft handles SoulBound itself"
2018-01-25 09:03:12 +01:00
Martin Robertz 3af0cb5421 Revert "Allow Galacticraft handles SoulBound itself" 2018-01-25 09:03:01 +01:00
Martin Robertz ca6f5954f3 Merge pull request #4 from Ugachaga/patch-3
Allow Galacticraft handles SoulBound itself
2018-01-25 07:17:32 +01:00
Ugachaga a5a61f9fe5 Allow Galacticraft handles SoulBound itself 2018-01-25 13:07:41 +07:00
Dream-Master 037e9a47ec bump version 2.3.0.432 2017-03-06 21:40:27 +01:00
Martin Robertz b646a594c4 Merge pull request #3 from Ugachaga/patch-2
Allow Baubles handle SoulBound itself
2017-03-06 21:36:20 +01:00
Ugachaga d5f78ad1f3 Allow Baubles handle SoulBound itself 2017-03-07 03:18:41 +07:00
Ugachaga 246633ca7b Fixed Googles chat message 2017-03-04 08:45:33 +07:00
Dream-Master b2f73f1870 bump version add gitignore 2.3.0.431 2017-03-03 22:08:00 +01:00
Martin Robertz 06a902dd3c Merge pull request #2 from Ugachaga/patch-1
Added support for NightVision enchant
2017-03-03 22:06:08 +01:00
Ugachaga dbfe3d10f6 Added support for NightVision enchant 2017-03-04 03:23:30 +07:00
Martin Robertz 77beea05aa Merge pull request #1 from catt0/master
farming station will cut down IC2 rubber trees if an axe is present
2017-01-10 18:42:13 +01:00
Henry Loenwind 11077c38a8 Merge pull request #3874 from yepidoodles/patch-1
Fixed a spelling mistake
2016-12-03 17:07:21 +01:00
yepidoodles f77f6a9fdf Fixed a spelling mistake 2016-12-03 15:14:43 +00:00
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
Henry Loenwind f94c442a55 Backport: Prevent generators from stalling if they are configured to produce more RF/t than normal 2016-08-10 22:40:03 +02:00
Benjamin Kollenda f805e88147 farming station will cut down IC2 rubber trees if an axe is present 2016-07-25 17:01:19 +02:00
Henry Loenwind d2efbd5694 Backport: Fix for inventory panel creating 'phantom items' (#3508)
* Fix for inventory panel creating 'phantom items'
2016-07-12 04:58:55 +02:00
MatthiasMann d3830941b3 Merge pull request #3473 from HenryLoenwind/invFix
Fixed invPanel item mixup
2016-07-04 22:00:53 +02:00
Henry Loenwind 65899cdd12 Fixed invPanel item mixup 2016-07-04 20:13:58 +02:00
tterrag1098 746c3383c8 Make all machine sounds mono, this fixes them not being directional
This commit should be directly portable to 1.9/1.10
2016-07-03 06:11:04 -04: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
Henry Loenwind 411e760ed1 Small Fixes for the Farm (#3344)
Small Fixes for the Farm (actually one big one, too)
2016-06-14 00:00:05 +02:00
Tytannial b283616c7e Update zh_CN.lang and add missing localization strings. 2016-06-11 14:20:57 +08:00
Henry Loenwind d61fc2cfdb Updated ec requirement to skip buggy versions 2016-05-28 19:01:32 +02: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
OneEyeMaker dba784cbea Fixed whitespace changes (hopefully) 2016-05-19 09:55:47 +03:00
OneEyeMaker 69c930eea4 Added config options for TelePad 2016-05-18 16:28:17 +03:00
Henry Loenwind 63f715f506 Side-hardened IMC processing 2016-05-14 22:35:59 +02:00
Henry Loenwind 7411e4454a Fixed PowerDistributor distributing power backwards
re #3222
2016-05-04 03:34:57 +02:00
MaPePeR 7bbaa744b4 Show Block Name ins GuiExternalConnectionSelector. Fixes #1984 2016-05-02 19:11:22 +02:00
Henry Loenwind af620663a9 Added new Magic Crops hoe names 2016-04-10 13:39:28 +02:00
tterrag1098 da3b08abad Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git 2016-04-07 21:11:11 -04:00