Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-30 02:38:34 +01:00
Code Issues Projects Releases Wiki Activity
1175 commits 14 branches 4 tags 33 MiB
Commit graph

1053 commits

Author SHA1 Message Date
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
Kristian295
d1924045c0 Translation of ll. 157-186, 429, 430 
yet untranslated lines:
572-773
 2016-01-29 23:53:29 +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
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
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
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
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
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
Patrick Emery
62a4b04e6f Added right-click harvest functionality to all crops. 2016-01-15 21:39:38 -05: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
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
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
canitzp
15c03f2a43 FurnaceSolar/Solar Panel JSON 2016-01-09 18:37:30 +01:00
canitzp
f18dfa97c8 FurnaceSolar/Solar Panel JSON 2016-01-09 18:37:21 +01:00
Ellpeck
bca7812097 Merge pull request #40 from canitzp/1.8 
-Coffee Machine JSON \o/
 2016-01-09 18:08:42 +01:00
canitzp
8efe5482f8 -Coffee Machine JSON \o/ 2016-01-09 18:07:18 +01:00
Ellpeck
4ed17950b9 Removed TESRs for the most part and added a "not complete"-disclaimer for the upcoming 1.8.9 beta releases ~ 2016-01-09 17:53:06 +01:00
Ellpeck
0d00143298 Maybe fixed a bug caused by desync that would cause blocks to have ridiculous amounts of energy/luqiuid 2016-01-09 17:30:24 +01:00
Ellpeck
61b921b2dd Some more texture work. 
Done for now.
Hahah.
Good joke.
 2016-01-09 14:35:04 +01:00
Ellpeck
fec10edbc2 Loooots more texture work. 
Okay, I'm done for today.
 2016-01-09 02:36:43 +01:00
Ellpeck
2babb6cf0b Some more texture work, fixed Special Render for items 2016-01-09 00:04:30 +01:00
Ellpeck
6db479f94e More stuff & special render fix testing 2016-01-08 23:36:35 +01:00
Ellpeck
8f959c92aa More Fixes °~° 
Continuing some other time.
 2016-01-08 21:55:39 +01:00
Ellpeck
51872bbc23 Dis game is ass - More textures 2016-01-08 20:51:03 +01:00
Ellpeck
98efec99d0 Fixed knife crafting being broken 2016-01-08 18:09:11 +01:00
Ellpeck
77860267da ITEMS AND BLOCKS RENDER 
Well.
Not all of them.
 2016-01-08 17:25:31 +01:00
Ellpeck
c08d2221fa This doesn't work. 2016-01-08 16:52:53 +01:00
Ellpeck
020384f5ff Put Version and API Name in main class 2016-01-08 15:33:19 +01:00
Ellpeck
6693636247 Bump API version. 
If I don't do it now, I'll forget.
 2016-01-08 15:26:52 +01:00
Ellpeck
92b9b7a844 Some more "minor fixes", if you want to call it that. 
(I declare you completely nuts if you do, though.)
 2016-01-08 15:21:05 +01:00