Commit graph

2139 commits

Author SHA1 Message Date
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
Ellpeck
54cc8eedbd Remove NEI Recipe Handlers (until it gets properly updated) 2016-01-23 12:09:29 +01:00
Ellpeck
aa30035cee Added performance settings for bad PCs 2016-01-23 11:02:35 +01:00
Ellpeck
8d59b01191 Changing some stuff to the tooltip CTRL thingy so that it looks nicer 2016-01-22 21:48:11 +01:00
Ellpeck
f89c969b24 remove todo 2016-01-22 21:43:43 +01:00
Ellpeck
f0046aadc4 remove todo 2016-01-22 19:40:15 +01:00
Ellpeck
317978787c Added metadata and nbt to the Control info for ItemStacks 2016-01-22 19:40:00 +01:00
Ellpeck
c9f3b926cc Fix Coffee Machine and Smiley Cloud bounding box 2016-01-22 19:02:04 +01:00
Ellpeck
0b3201bcf9 Ignore some Items in JEI 2016-01-22 18:52:38 +01:00
Ellpeck
6edab422c4 Fix plant right-clicking never returned any seeds 2016-01-22 18:27:28 +01:00
Ellpeck
6d719f781c "Fix" smiley cloud bounding box.
For now.
2016-01-22 12:25:10 +01:00
Ellpeck
263004d4b4 Made phantom booster cheaper 2016-01-21 21:32:08 +01:00
Ellpeck
c7ccab75b8 Cheap workaround for glitching into some blocks with a smaller hitbox causing graphical glitches and damaging the player 2016-01-21 19:59:26 +01:00
Ellpeck
c4f8e67d64 Why was that there? 2016-01-21 19:43:06 +01:00
Ellpeck
ac5d789c78 "nice" 2016-01-20 20:30:39 +01:00
Ellpeck
fd5253846f Merge pull request #60 from XDjackieXD/master
winey winey
2016-01-20 20:28:44 +01:00
XDjackieXD
2610bb8699 Make the floaty special thingie move more awesome! 2016-01-20 20:24:16 +01:00
Ellpeck
037df04965 I don't know what ImmutableList is.
So I'm not using it.
/shrugs
2016-01-20 20:09:03 +01:00
Jakob
fd50e20005 Merge pull request #1 from Ellpeck/master
update
2016-01-20 19:50:11 +01:00
Ellpeck
223db4e04e Transmaterial Differentiator 2016-01-19 21:56:45 +01:00
Ellpeck
ca30b483e1 Ignore NBT Tags of Energy items in JEI 2016-01-18 23:38:52 +01:00
Ellpeck
acc75f5313 ..fixed assets derping because of wrong capitalization 2016-01-18 21:38:18 +01:00
Ellpeck
8990e8cb70 r24! 2016-01-17 23:46:31 +01:00
Ellpeck
5ca0fd53d3 Reconstructor recipe handler 2016-01-17 22:57:32 +01:00
Ellpeck
924e7da95f to be safe3 2016-01-17 20:50:25 +01:00
Ellpeck
4b835f8df8 Custom packet handler for 98.7% less stack traces when joining worlds 2016-01-17 20:46:51 +01:00
Ellpeck
060a4dcbb3 red mushroom -> nether wart in Reconstructor 2016-01-17 20:12:20 +01:00
Ellpeck
1a258f8ed5 Fixed the drill's 3x3 and 5x5 mining acting weird on servers 2016-01-17 19:22:14 +01:00
Ellpeck
2189dde1a0 JEI Crusher 2016-01-17 15:09:59 +01:00
canitzp
f858155a30 Merge pull request #2 from Ellpeck/master
Update Repository
2016-01-17 13:40:18 +01:00
Ellpeck
59d835ed4f Added Coffee Machine JEI recipe
Removed some stuff from the API that doesn't really belong there
2016-01-17 12:17:24 +01:00
Ellpeck
957acd8ab8 Fixed lenses not syncing correctly on the server when converting Item entities 2016-01-17 01:50:35 +01:00
Ellpeck
a4f2251ff6 Removed INEIRecipeHandler and RecipeWrapperWithButton from the API.
They won't work that way.
/shrugs
2016-01-17 01:14:30 +01:00
Ellpeck
e130f89296 Added proper JEI Handler for booklet
Added RecipeWrapperWithButton to API
2016-01-17 01:09:36 +01:00
Ellpeck
b76d96c303 removed INEIRecipeHandler away from the API.
I don't know why it was there.
API version 5
2016-01-16 23:47:06 +01:00
Ellpeck
720f80160b Made word count reload when reloadoing resources 2016-01-16 23:14:10 +01:00
Ellpeck
3397632e87 Started JEI Implementation. 2016-01-16 20:06:25 +01:00
Ellpeck
07c24cf8dc Fixed the mess blur created 2016-01-16 14:14:39 +01:00
Ellpeck
0cc6428e45 Merge pull request #57 from ssblur/master
Added right-click harvest functionality to all crops.
2016-01-16 14:09:38 +01:00
Patrick Emery
62a4b04e6f Added right-click harvest functionality to all crops. 2016-01-15 21:39:38 -05:00
Ellpeck
7a69411948 Merge pull request #56 from Kristian295/patch-5
Molecular Transformilator
2016-01-16 01:50:40 +01:00
Kristian295
95970617f4 Molecular Transformilator
Just added line 713 from en_US.

There will be more translating going on later this weekend!
2016-01-15 23:08:16 +01:00
Ellpeck
ddc1ab7ce5 Molecular Transformilator 2016-01-15 22:05:36 +01:00
Ellpeck
352604aac1 Updated the stuff to the other stuff.
In layman's terms: Made 1.8 the master branch.
2016-01-13 21:48:48 +01:00
Ellpeck
1a951c1a4e Merge pull request #48 from ssblur/1.8
Fixed textures being broken ._.
2016-01-12 00:39:23 +01:00
Patrick Walker
0629b53d30 Fixed texture name 2016-01-11 18:34:06 -05:00
Patrick Walker
dbebafb1e5 Update itemSwordQuartz.json 2016-01-11 18:33:40 -05:00