tterrag1098
|
b579bcdcd8
|
Finish ingame configs.
Thanks @bspkrs :)
Oh also fix Crazy's spelling again :P
|
2014-06-28 23:43:41 -04:00 |
|
tterrag1098
|
95693aaf8b
|
Merge branch '1.7.10' of https://github.com/CrazyPants/EnderIO.git into 1.7.10
|
2014-06-28 05:50:23 -04:00 |
|
tterrag1098
|
8be88c1d01
|
Begin implementation of ingame configs.
@bspkrs I have no idea what I'm doing.
|
2014-06-28 05:50:15 -04:00 |
|
tterrag1098
|
37558c0a7e
|
Merge remote-tracking branch 'origin/master' into 1.7.10
|
2014-06-25 05:45:56 -04:00 |
|
CrazyPants
|
bb2875f572
|
#776 Ore dictionary support in recipes broken.
|
2014-06-26 17:38:30 +08:00 |
|
CrazyPants
|
7647c57825
|
#773 Included the @API declaration for bundled RF API
|
2014-06-25 16:45:42 +08:00 |
|
CrazyPants
|
0eba5a744f
|
Merge branch 'master' of https://github.com/CrazyPants/EnderIO
|
2014-06-25 16:33:44 +08:00 |
|
CrazyPants
|
15f827ea4d
|
Moved 1.7 branch onto master.
|
2014-06-25 16:33:09 +08:00 |
|
CrazyPants
|
1b80ac14bd
|
Merge branch 'master' into 1.7
|
2014-06-25 16:01:08 +08:00 |
|
tterrag1098
|
169c2514f4
|
Fix gitignore to not upload anything in .settings
|
2014-06-24 22:45:21 -04:00 |
|
tterrag1098
|
21421910e3
|
Update to 1.7.10_pre4 (Forge 1138)
|
2014-06-24 22:31:09 -04:00 |
|
CrazyPants
|
e2f4a1f4ea
|
Merge pull request #772 from Vexatos/patch-7
Update de_DE.lang
|
2014-06-24 15:58:46 +08:00 |
|
Vexatos
|
bc4b9c4104
|
Update de_DE.lang
|
2014-06-23 16:06:29 +02:00 |
|
CrazyPants
|
e6971b5651
|
Changed version to 2.0_beta
|
2014-06-23 18:54:37 +08:00 |
|
CrazyPants
|
08647dc0bf
|
#762 The roof of the Farming Station next to a solid block disappears
|
2014-06-23 18:52:27 +08:00 |
|
CrazyPants
|
452bb1fe22
|
#758 Nether Quarz Slabs have the same yield as Blocks (SAG Mill)
|
2014-06-21 20:25:11 +08:00 |
|
CrazyPants
|
c7556343cd
|
#755 Sand+Sand in Alloy smelter = Enlightened Clear Glass
|
2014-06-21 20:16:56 +08:00 |
|
tterrag1098
|
bc192e8a65
|
Switch to iterator in Crafter to make MatthiasM2 happy
|
2014-06-19 14:18:52 -04:00 |
|
tterrag1098
|
78109e2b7d
|
Farm upgrades. Fix some power display bugs. Fix CME in Crafter.
|
2014-06-19 14:05:29 -04:00 |
|
tterrag1098
|
cfd32a7ef8
|
Change the crafter to function on a buffer as per request.
|
2014-06-19 13:01:53 -04:00 |
|
tterrag1098
|
6c308fade5
|
#757 Crafter not returning container items.
@CrazyPants stop setting stacks to null >:(
|
2014-06-19 00:00:11 -04:00 |
|
CrazyPants
|
d9b3bc0645
|
Merge branch '1.7' of https://github.com/CrazyPants/EnderIO into 1.7
|
2014-06-19 13:11:52 +08:00 |
|
CrazyPants
|
c5bee1942b
|
Excluded ingot from sag mill bonuses.
|
2014-06-19 13:11:40 +08:00 |
|
tterrag1098
|
fec888d325
|
Proper @SideOnly annotations on ANY references to IIcons
|
2014-06-17 15:12:15 -04:00 |
|
tterrag1098
|
0c1aac76b2
|
Organize imports to fix server crash.
|
2014-06-17 14:52:34 -04:00 |
|
CrazyPants
|
2ab6085489
|
Added recipe and GUI for powered spawner.
|
2014-06-17 20:19:56 +08:00 |
|
CrazyPants
|
db8b914ca6
|
Added code to the DarkSteelAxe to handle both the bugged and fixed versions of forge.
|
2014-06-17 19:19:44 +08:00 |
|
CrazyPants
|
3182f4a4a8
|
More work on powered spawner.
|
2014-06-17 19:15:06 +08:00 |
|
CrazyPants
|
0d7d60a19a
|
Fixed com. gen. crash
|
2014-06-17 14:25:37 +08:00 |
|
tterrag1098
|
c31965622a
|
#753 Config options for farm
|
2014-06-16 23:58:31 -04:00 |
|
CrazyPants
|
a4bfc60b7d
|
Initial work on powered spawner.
|
2014-06-16 23:05:52 +08:00 |
|
CrazyPants
|
1553fbbf12
|
#747 NullPointerException: Ticking screen
|
2014-06-16 13:38:18 +08:00 |
|
CrazyPants
|
20a2d2ac61
|
Some performance tweaks.
|
2014-06-16 13:03:09 +08:00 |
|
CrazyPants
|
ccfb2bd04b
|
Removed redundant call.
|
2014-06-16 11:09:48 +08:00 |
|
CrazyPants
|
3c52d51ade
|
#744 Farming station eats Ichorium Axe bug
|
2014-06-16 11:02:15 +08:00 |
|
CrazyPants
|
2850d46d0d
|
Adjusted farm and hootch energy values.
Fixed crash.
|
2014-06-15 23:35:46 +08:00 |
|
CrazyPants
|
2f247084fb
|
Added filter for Ender Fluid Conduits.
|
2014-06-15 17:21:11 +08:00 |
|
CrazyPants
|
2d61560f42
|
Created generic round robin iterator for use by fluid and item conduits.
|
2014-06-14 21:25:30 +08:00 |
|
CrazyPants
|
2fb3dc69ec
|
Merge branch '1.7' of https://github.com/CrazyPants/EnderIO into 1.7
|
2014-06-14 21:05:54 +08:00 |
|
CrazyPants
|
60556483f7
|
Added 'Ender Fluid Conduits', which support multiple liquids and provide instant transfer.
Filters still to be added.
|
2014-06-14 21:05:32 +08:00 |
|
CrazyPants
|
cfc2884e7b
|
Added recipe for inverted -> non-inverted light
|
2014-06-13 18:54:02 +08:00 |
|
CrazyPants
|
170451e675
|
Fixed plate not dropping.
|
2014-06-13 17:23:23 +08:00 |
|
CrazyPants
|
a888492309
|
Added player only 'Dark Pressure Plate'
|
2014-06-13 16:05:17 +08:00 |
|
CrazyPants
|
95e3e7ecba
|
Added painted carpet.
|
2014-06-13 12:06:54 +08:00 |
|
CrazyPants
|
eb7aa5b300
|
Removed debug.
|
2014-06-13 08:57:29 +08:00 |
|
CrazyPants
|
e228dc6169
|
Fixed lights dropping the wrong thing.
|
2014-06-13 08:56:32 +08:00 |
|
CrazyPants
|
683dcf3b64
|
Merge pull request #745 from Adaptivity/patch-3
Update ru_RU.lang
|
2014-06-13 07:27:32 +08:00 |
|
Anton
|
83bf621d9e
|
Update en_US.lang
|
2014-06-12 20:57:01 +04:00 |
|
Anton
|
45e54f2982
|
Update ru_RU.lang
|
2014-06-12 20:55:23 +04:00 |
|
CrazyPants
|
3d04e5ed04
|
Added a semi working fix for glowstone painted with grass.
|
2014-06-12 22:47:42 +08:00 |
|