1268 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Ellpeck	ab0adfa25b	Revert the fix, tried to fix it another way	2016-01-11 22:41:33 +01:00
Ellpeck	85428e885d	Workaround for a bug that broke the packet handling	2016-01-11 22:33:54 +01:00
Ellpeck	dbf8093ea0	fml	2016-01-11 22:15:50 +01:00
Ellpeck	f014b1af57	r23 ~	2016-01-11 22:02:41 +01:00
Ellpeck	5b166a784f	Fixed a ginormous bug that fucked up crafting. ... I hope.	2016-01-11 21:56:01 +01:00
Ellpeck	013518a57c	r22 ~	2016-01-11 19:01:55 +01:00
Ellpeck	d3950d257c	Fixed wild plants dropping the wrong seeds.	2016-01-11 18:55:39 +01:00
Ellpeck	b8b94b91f1	Fixed some more bugs, update the update checker to check for betas as well~	2016-01-11 18:27:47 +01:00
Ellpeck	e15d1fa882	Actually fix the new update checker	2016-01-10 21:00:12 +01:00
Ellpeck	2620687e2d	Added the new update checker for 1.8 as well	2016-01-10 20:59:13 +01:00
Ellpeck	5bc747f6aa	Final fixes~	2016-01-10 20:16:19 +01:00
Ellpeck	ed833be289	Finished 1.8.9 port for the most part. ... Some stuff to fix yet though.	2016-01-10 19:32:21 +01:00
Ellpeck	a5c97e09bd	Merge pull request #44 from canitzp/1.8 ... More JSONs	2016-01-10 17:34:15 +01:00
canitzp	c645a0e770	More JSONs	2016-01-10 17:00:07 +01:00
Ellpeck	3f165f897e	ALL OF THE JSONS DONE. ... Now I just need to wait for canitzp to finish the special models~	2016-01-10 15:29:45 +01:00
Ellpeck	390c1289f8	Merge pull request #43 from canitzp/1.8 ... More JSONs	2016-01-10 15:18:56 +01:00
canitzp	0cb9d6f8c9	More JSONs	2016-01-10 15:12:48 +01:00
canitzp	0b68b7e296	More JSONs	2016-01-10 15:12:20 +01:00
Ellpeck	860ef3d0ef	Moooooar texture work ~	2016-01-10 02:51:31 +01:00
Ellpeck	5e0e79d691	Some more texture work & fixing. ... Nothing special. Well, lots of special stuff actually.	2016-01-10 01:17:17 +01:00
canitzp	0f090df466	Merge remote-tracking branch 'origin/1.8' into 1.8	2016-01-09 18:37:52 +01:00