Commit graph

2935 commits

Author SHA1 Message Date
Ellpeck
9de1027740 Merge pull request #73 from canitzp/master
Updated Forge, JEI and RF-Api
2016-02-16 21:52:24 +01:00
canitzp
6819c6b34b Updated to the official RF-Api for 1.8 2016-02-16 21:49:44 +01:00
canitzp
8bdf350a4d Updated JEI to 26.0.154 2016-02-16 21:38:11 +01:00
canitzp
bbcf9bd05d Updated Forge to 1747 2016-02-16 20:14:28 +01:00
canitzp
f5205c3263 Merge pull request #3 from Ellpeck/master
-Update Repo
2016-02-16 19:58:28 +01:00
Ellpeck
c16629b470 Revert 5272d572be 2016-02-10 21:07:48 +01:00
Glenthor
5272d572be -Added Rounded Prism 2016-02-10 21:06:25 +01:00
Kristian295
e2b9ab704d Fixed ll. 572 - 579
Fixed:
- lengths of texts (didn't match with page lengths)
- orthographic mistakes
2016-02-10 18:00:08 +01:00
Ellpeck
ef07e2d725 Revert #72.
Text is too long for the pages.
2016-02-09 18:29:48 +01:00
Ellpeck
f7203cfc73 Merge pull request #72 from Kristian295/patch-7
de_DE.lang : ll. 572 - 579
2016-02-09 18:25:51 +01:00
Kristian295
8caecdfd23 de_DE.lang : ll. 572 - 579
Translated:
- booklet.actuallyadditions.chapter.intro.*
- booklet.actuallyadditions.chapter.craftingIngs.*
2016-02-09 18:19:11 +01:00
Ellpeck
32c10c5beb Haphazardly revert implementation of new item system for ESD as it completely broke pulling items for sided inventories 2016-02-06 22:07:12 +01:00
Ellpeck
e15c09778e Set ESD incomplete 2016-02-06 21:56:00 +01:00
Ellpeck
63641f9520 Update Forge and JEI and shit 2016-02-06 20:55:19 +01:00
Ellpeck
d2721e0979 added click areas to JEI for easy recipe access 2016-02-05 11:19:02 +01:00
Ellpeck
d593a05cca bump api version 2016-02-03 23:46:22 +01:00
Ellpeck
2856c01cce Removed Lens registry.
It wasn't needed.
2016-02-03 23:43:44 +01:00
Ellpeck
2007732fdc Changed download link to be the redirect so that it changes everywhere when it actually changes 2016-02-03 18:16:24 +01:00
Ellpeck
9c4056ed52 Made the knife not repairable.
Closes #69 (hehehehe)
2016-02-02 07:25:26 +01:00
Ellpeck
58286063ed r25! 2016-02-01 21:26:44 +01:00
Ellpeck
0d7340474f Update JEI properly damn it 2016-02-01 21:20:05 +01:00
Ellpeck
34dbefc9e6 ESD Compat for new item system 2016-02-01 21:14:17 +01:00
Ellpeck
56489b362a There we go.
I fixed it.
2016-02-01 20:39:11 +01:00
Ellpeck
228ecd50bd More cleanup.
I hope this fixes the fuckery.
God damn it.
2016-02-01 20:32:49 +01:00
Ellpeck
348dc518c6 The heck!? 2016-02-01 20:31:27 +01:00
Ellpeck
2d476a0b6d What the fuck IntelliJ 2016-02-01 20:30:15 +01:00
Ellpeck
0540313e75 Cleanup ~ 2016-02-01 17:49:55 +01:00
Ellpeck
c92aebfe0a Fixed Compost and Reconstructor syncing with hoppers.
Closes #59
2016-02-01 17:43:14 +01:00
Ellpeck
091b6cbfc3 Fix capabilities 2016-02-01 17:40:17 +01:00
Ellpeck
1e3f0dbe45 Revert that. 2016-01-31 10:54:07 +01:00
Ellpeck
4ac5007279 Made handler compatible with old JEI versions.
Just in case.
2016-01-31 10:53:27 +01:00
Ellpeck
7586b7cd56 Made the placer be able to apply bonemeal and do some more awesome stuffz 2016-01-31 03:31:39 +01:00
Ellpeck
9ed85158e7 Merge remote-tracking branch 'origin/master' 2016-01-31 01:15:12 +01:00
Ellpeck
a0aa92fc4c Update Forge and stuff 2016-01-31 01:14:57 +01:00
Ellpeck
665b8e1851 Merge pull request #68 from Kristian295/patch-6
Translation of ll. 157-186, 429, 430
2016-01-30 09:06:27 +01:00
Kristian295
d1924045c0 Translation of ll. 157-186, 429, 430
yet untranslated lines:
572-773
2016-01-29 23:53:29 +01:00
Ellpeck
1c117e9ca4 Merge pull request #66 from Kristian295/patch-6
Matching de_DE.lang with en_US.lang
2016-01-29 23:49:52 +01:00
Kristian295
e312ce1f74 Matching de_DE.lang with en_US.lang
yet untranslated lines:
157-186, 429-430, 572-773
2016-01-29 23:14:03 +01:00
Ellpeck
4630c39a13 Move Fluids to InitFluids 2016-01-29 17:38:31 +01:00
Ellpeck
3f958a0726 I don't even know the person
But I'm a nice person.
2016-01-27 18:22:44 +01:00
Ellpeck
a452d9a13f Update forge.
IInventory is still not deprecated.
Fuck this.
2016-01-25 22:59:13 +01:00
Ellpeck
3c108e3cc9 Remove debug output 2016-01-25 19:33:54 +01:00
Ellpeck
bb0338dd55 //TODO make this work for the stupid new system 2016-01-25 19:05:01 +01:00
Ellpeck
a2d7193003 Capabilities for Phantomfaces 2016-01-25 13:42:37 +01:00
Ellpeck
235d86ab8c Semi-implemented new item system I guess? 2016-01-25 13:34:55 +01:00
Ellpeck
7a6fda911f Use getStateID for playAuxSFX 2016-01-23 23:29:19 +01:00
Ellpeck
fbc5c5240d Rebalanced canola oil again.
Because people were annoying me again.
2016-01-23 22:58:40 +01:00
Ellpeck
313c716471 Remove textures to be mae file 2016-01-23 15:26:31 +01:00
Ellpeck
ca68c1afea updated forge and jei 2016-01-23 14:26:42 +01:00
Ellpeck
8e7422df0f no 2016-01-23 12:20:06 +01:00