Commit Graph
3540 Commits
Author SHA1 Message Date
Henry Loenwind 65899cdd12 Fixed invPanel item mixup 2016-07-04 20:13:58 +02: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
tterrag1098 846d14eaf4 Fix weather obelisk accepting invalid fluids 2016-04-07 21:10:34 -04:00
tterrag 39511c92f2 Merge pull request #3242 from bence98/patch-1
Added a few missing .name postfixes
2016-03-26 03:50:54 -04:00
bence98 128fa31d99 Added a few missing .name postfixes 2016-03-25 15:29:09 +01:00
tterrag c70377e3e3 Merge pull request #3231 from HenryLoenwind/tooltip
Removed outdated config setting
2016-03-17 21:15:24 -04:00
MatthiasMann c919da1823 Merge pull request #3213 from HenryLoenwind/vatInput
Tag Nutrient Distilation as having optional inputs
2016-03-17 21:41:57 +01:00
Henry Loenwind 5e330e04fc Update ISSUE_TEMPLATE.md 2016-03-17 17:01:17 +01:00
Henry Loenwind 2448884257 Removed outdated config setting
* re #3230
2016-03-17 03:27:07 +01:00
tterrag1098 4d0e45557e Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git 2016-03-11 23:49:08 -05:00
tterrag1098 9ba0554651 Add SideOnly to weather rocket method to prevent server crash 2016-03-11 23:48:00 -05:00
tterrag 2bfe7e1193 Merge pull request #3216 from HenryLoenwind/prettyBurnRate
Nice number formatting for stirling generator GUI
2016-03-01 14:34:14 -05:00
Henry Loenwind 1997e948f2 Nice number formatting for stirling generator GUI 2016-03-01 03:59:19 +01:00
Henry Loenwind 42feef6b8d Tag Nutrient Distilation as having optional inputs 2016-03-01 00:23:17 +01:00
tterrag1098 0a6da8f559 Merge branch 'master' of https://github.com/SleepyTrousers/EnderIO.git 2016-02-27 20:04:16 -05:00
tterrag1098 06a2013609 #3191 Fix flipper upgrade activating during creative flight 2016-02-27 20:03:54 -05:00
tterrag f60e124914 Add spot in issue template for log file 2016-02-27 19:58:06 -05:00
tterrag1098 3f8c8521eb Fix dark axe not firing HarvestDropsEvent 2016-02-27 17:20:37 -05:00
tterrag1098 c65afd8e8b Completely rework weather obelisk. GUI and recipes not final. 2016-02-26 15:32:42 -05:00
Urey.X 0fe44f466f Update zh_CN.lang 2016-02-25 23:13:26 -05:00
tterrag 2a0fe3b76a Update issue formatting and add note about "latest" 2016-02-18 21:06:36 -05:00
tterrag f0fd20e817 Add issue template 2016-02-18 20:43:38 -05:00
tterrag1098 e83bc60d7e Change formatter settings to allow longer comments 2016-02-04 21:18:15 -05:00
tterrag1098 829a2d31fa Rework telepad formation a bit. Now uses an explicit master state. 2016-02-04 21:16:53 -05:00
tterrag1098 1cabec4e0d Remove telepad sound volume altering as it caused glitchy noises 2016-02-04 18:58:44 -05:00
tterrag1098 eb2c2bb283 #2766 Fix spinSpeed getting set ridiculously high on short teleports 2016-02-04 18:47:44 -05:00
tterrag 4d10ae129c Merge pull request #3030 from HenryLoenwind/combTheDesert
Improve handling of single-input recipes
2016-02-04 14:52:20 -05:00
HenryLoenwind 7b7ca9ac6a Handle Baubles inv more careful im MP 2016-01-27 23:10:54 +01:00
HenryLoenwind bb06413fda Prevent magnet from being used as battery by default 2016-01-27 22:48:34 +01: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
HenryLoenwind 41ee6cdd17 Allow "gradle install" to install into local Maven repo 2016-01-24 14:16:29 +01: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