Commit graph

  • f89c969b24 remove todo Ellpeck 2016-01-22 21:43:43 +0100
  • f0046aadc4 remove todo Ellpeck 2016-01-22 19:40:15 +0100
  • 317978787c Added metadata and nbt to the Control info for ItemStacks Ellpeck 2016-01-22 19:40:00 +0100
  • c9f3b926cc Fix Coffee Machine and Smiley Cloud bounding box Ellpeck 2016-01-22 19:02:04 +0100
  • 0b3201bcf9 Ignore some Items in JEI Ellpeck 2016-01-22 18:52:38 +0100
  • 6edab422c4 Fix plant right-clicking never returned any seeds Ellpeck 2016-01-22 18:27:28 +0100
  • 6d719f781c "Fix" smiley cloud bounding box. For now. Ellpeck 2016-01-22 12:25:10 +0100
  • 263004d4b4 Made phantom booster cheaper Ellpeck 2016-01-21 21:32:08 +0100
  • c7ccab75b8 Cheap workaround for glitching into some blocks with a smaller hitbox causing graphical glitches and damaging the player Ellpeck 2016-01-21 19:59:26 +0100
  • c4f8e67d64 Why was that there? Ellpeck 2016-01-21 19:43:06 +0100
  • ac5d789c78 "nice" Ellpeck 2016-01-20 20:30:39 +0100
  • fd5253846f Merge pull request #60 from XDjackieXD/master Ellpeck 2016-01-20 20:28:44 +0100
  • 2610bb8699 Make the floaty special thingie move more awesome! XDjackieXD 2016-01-20 20:24:16 +0100
  • 037df04965 I don't know what ImmutableList is. So I'm not using it. /shrugs Ellpeck 2016-01-20 20:09:03 +0100
  • fd50e20005 Merge pull request #1 from Ellpeck/master Jakob 2016-01-20 19:50:11 +0100
  • 223db4e04e Transmaterial Differentiator Ellpeck 2016-01-19 21:56:45 +0100
  • ca30b483e1 Ignore NBT Tags of Energy items in JEI Ellpeck 2016-01-18 23:38:52 +0100
  • acc75f5313 ..fixed assets derping because of wrong capitalization Ellpeck 2016-01-18 21:38:18 +0100
  • 8990e8cb70 r24! Ellpeck 2016-01-17 23:46:31 +0100
  • 5ca0fd53d3 Reconstructor recipe handler Ellpeck 2016-01-17 22:57:32 +0100
  • 924e7da95f to be safe3 Ellpeck 2016-01-17 20:50:25 +0100
  • 4b835f8df8 Custom packet handler for 98.7% less stack traces when joining worlds Ellpeck 2016-01-17 20:46:51 +0100
  • 060a4dcbb3 red mushroom -> nether wart in Reconstructor Ellpeck 2016-01-17 20:12:20 +0100
  • 1a258f8ed5 Fixed the drill's 3x3 and 5x5 mining acting weird on servers Ellpeck 2016-01-17 19:22:14 +0100
  • 2189dde1a0 JEI Crusher Ellpeck 2016-01-17 15:09:59 +0100
  • f858155a30 Merge pull request #2 from Ellpeck/master canitzp 2016-01-17 13:40:18 +0100
  • 59d835ed4f Added Coffee Machine JEI recipe Removed some stuff from the API that doesn't really belong there Ellpeck 2016-01-17 12:17:24 +0100
  • 957acd8ab8 Fixed lenses not syncing correctly on the server when converting Item entities Ellpeck 2016-01-17 01:50:35 +0100
  • a4f2251ff6 Removed INEIRecipeHandler and RecipeWrapperWithButton from the API. They won't work that way. /shrugs Ellpeck 2016-01-17 01:14:30 +0100
  • e130f89296 Added proper JEI Handler for booklet Added RecipeWrapperWithButton to API Ellpeck 2016-01-17 01:09:36 +0100
  • b76d96c303 removed INEIRecipeHandler away from the API. I don't know why it was there. API version 5 Ellpeck 2016-01-16 23:47:06 +0100
  • 720f80160b Made word count reload when reloadoing resources Ellpeck 2016-01-16 23:14:10 +0100
  • 3397632e87 Started JEI Implementation. Ellpeck 2016-01-16 20:06:25 +0100
  • 07c24cf8dc Fixed the mess blur created Ellpeck 2016-01-16 14:14:39 +0100
  • 0cc6428e45 Merge pull request #57 from ssblur/master Ellpeck 2016-01-16 14:09:38 +0100
  • 62a4b04e6f Added right-click harvest functionality to all crops. Patrick Emery 2016-01-15 21:39:38 -0500
  • 7a69411948 Merge pull request #56 from Kristian295/patch-5 Ellpeck 2016-01-16 01:50:40 +0100
  • 95970617f4 Molecular Transformilator Kristian295 2016-01-15 23:08:16 +0100
  • ddc1ab7ce5 Molecular Transformilator Ellpeck 2016-01-15 22:05:36 +0100
  • 352604aac1 Updated the stuff to the other stuff. In layman's terms: Made 1.8 the master branch. Ellpeck 2016-01-13 21:48:48 +0100
  • 4bfe2cc63e Merge pull request #49 from Kristian295/patch-4 1.7.10 Ellpeck 2016-01-12 21:34:27 +0100
  • 5cd44330fe [de_DE] First part of booklet Kristian295 2016-01-12 17:33:07 +0100
  • 1a951c1a4e Merge pull request #48 from ssblur/1.8 Ellpeck 2016-01-12 00:39:23 +0100
  • 0629b53d30 Fixed texture name Patrick Walker 2016-01-11 18:34:06 -0500
  • dbebafb1e5 Update itemSwordQuartz.json Patrick Walker 2016-01-11 18:33:40 -0500
  • ab0adfa25b Revert the fix, tried to fix it another way Ellpeck 2016-01-11 22:41:33 +0100
  • 85428e885d Workaround for a bug that broke the packet handling Ellpeck 2016-01-11 22:33:54 +0100
  • 37d90f9fda fml Ellpeck 2016-01-11 22:18:24 +0100
  • 8a5dd83e0b Merge remote-tracking branch 'origin/master' Ellpeck 2016-01-11 22:18:03 +0100
  • 8410d1ec14 fml Ellpeck 2016-01-11 22:17:49 +0100
  • dbf8093ea0 fml Ellpeck 2016-01-11 22:15:50 +0100
  • 69fe485941 Update changelog.md Ellpeck 2016-01-11 22:02:47 +0100
  • f014b1af57 r23 ~ Ellpeck 2016-01-11 22:02:41 +0100
  • 28fd6eb809 Update updateVersions.properties Ellpeck 2016-01-11 22:01:44 +0100
  • 5b166a784f Fixed a ginormous bug that fucked up crafting. I hope. Ellpeck 2016-01-11 21:56:01 +0100
  • 9ba8bedc2d Merge pull request #45 from Kristian295/patch-3 Ellpeck 2016-01-11 20:18:12 +0100
  • 636128cc0f [de_DE] GUI, Container Names, Update Information Kristian295 2016-01-11 20:07:30 +0100
  • 93a28a7b76 Update changelog.md Ellpeck 2016-01-11 19:02:45 +0100
  • 013518a57c r22 ~ Ellpeck 2016-01-11 19:01:55 +0100
  • e3c35c2102 Made the 1.7 update checker also think about betas. Just in case. Ellpeck 2016-01-11 18:57:09 +0100
  • d3950d257c Fixed wild plants dropping the wrong seeds. Ellpeck 2016-01-11 18:55:39 +0100
  • b8b94b91f1 Fixed some more bugs, update the update checker to check for betas as well~ Ellpeck 2016-01-11 18:27:47 +0100
  • 8a6af1713f r21? Whaaat? Ellpeck 2016-01-10 21:12:06 +0100
  • e15d1fa882 Actually fix the new update checker Ellpeck 2016-01-10 21:00:12 +0100
  • 2620687e2d Added the new update checker for 1.8 as well Ellpeck 2016-01-10 20:59:13 +0100
  • b0558681d1 Added new update checker that can be version-specific or not Ellpeck 2016-01-10 20:51:29 +0100
  • f575b4f8c1 no r Ellpeck 2016-01-10 20:46:35 +0100
  • dbda43b9fb Testing new update checker~ Ellpeck 2016-01-10 20:45:55 +0100
  • 5bc747f6aa Final fixes~ Ellpeck 2016-01-10 20:16:19 +0100
  • ed833be289 Finished 1.8.9 port for the most part. Some stuff to fix yet though. Ellpeck 2016-01-10 19:32:21 +0100
  • a5c97e09bd Merge pull request #44 from canitzp/1.8 Ellpeck 2016-01-10 17:34:15 +0100
  • c645a0e770 More JSONs canitzp 2016-01-10 17:00:07 +0100
  • 3f165f897e ALL OF THE JSONS DONE. Now I just need to wait for canitzp to finish the special models~ Ellpeck 2016-01-10 15:29:44 +0100
  • 390c1289f8 Merge pull request #43 from canitzp/1.8 Ellpeck 2016-01-10 15:18:56 +0100
  • 0cb9d6f8c9 More JSONs canitzp 2016-01-10 15:12:48 +0100
  • 0b68b7e296 More JSONs canitzp 2016-01-10 15:12:20 +0100
  • 860ef3d0ef Moooooar texture work ~ Ellpeck 2016-01-10 02:51:31 +0100
  • 5e0e79d691 Some more texture work & fixing. Nothing special. Well, lots of special stuff actually. Ellpeck 2016-01-10 01:17:17 +0100
  • b67e2fe95b Merge pull request #42 from Kristian295/patch-2 Ellpeck 2016-01-10 01:16:46 +0100
  • 1d56db7ae4 Translated Items and Tooltips Kristian295 2016-01-10 01:01:37 +0100
  • 0f090df466 Merge remote-tracking branch 'origin/1.8' into 1.8 canitzp 2016-01-09 18:37:52 +0100
  • 15c03f2a43 FurnaceSolar/Solar Panel JSON canitzp 2016-01-09 18:37:30 +0100
  • f18dfa97c8 FurnaceSolar/Solar Panel JSON canitzp 2016-01-09 18:37:21 +0100
  • e94ff3b44a Update specialPeopleStuff.properties Ellpeck 2016-01-09 18:25:50 +0100
  • 3dda46d044 Update specialPeopleStuff.properties Ellpeck 2016-01-09 18:25:22 +0100
  • 837e446c94 Update specialPeopleStuff.properties Ellpeck 2016-01-09 18:18:20 +0100
  • 9cda52f90b Merge pull request #1 from Ellpeck/1.8 canitzp 2016-01-09 18:10:18 +0100
  • bca7812097 Merge pull request #40 from canitzp/1.8 Ellpeck 2016-01-09 18:08:42 +0100
  • 8efe5482f8 -Coffee Machine JSON \o/ canitzp 2016-01-09 18:07:18 +0100
  • 4ed17950b9 Removed TESRs for the most part and added a "not complete"-disclaimer for the upcoming 1.8.9 beta releases ~ Ellpeck 2016-01-09 17:53:06 +0100
  • 0d00143298 Maybe fixed a bug caused by desync that would cause blocks to have ridiculous amounts of energy/luqiuid Ellpeck 2016-01-09 17:30:24 +0100
  • 7ec5bb9952 Update specialPeopleStuff.properties Ellpeck 2016-01-09 17:24:30 +0100
  • 61b921b2dd Some more texture work. Done for now. Hahah. Good joke. Ellpeck 2016-01-09 14:35:04 +0100
  • 875ddc1a0c Dog damn it Kristian. Ellpeck 2016-01-09 11:51:30 +0100
  • 827bd0f76b Merge pull request #39 from Kristian295/patch-1 Ellpeck 2016-01-09 11:40:51 +0100
  • 287fba25a8 Update de_DE.lang Kristian295 2016-01-09 05:09:56 +0100
  • ab219824ca Merge 3552564764 into 4f6a6ed566 Kristian295 2016-01-09 02:24:31 +0000
  • 3552564764 Create de_DE.lang Kristian295 2016-01-09 03:22:49 +0100
  • fec10edbc2 Loooots more texture work. Okay, I'm done for today. Ellpeck 2016-01-09 02:36:43 +0100
  • 2babb6cf0b Some more texture work, fixed Special Render for items Ellpeck 2016-01-09 00:04:30 +0100