Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-12-28 05:39:37 +01:00
Code Issues Projects Releases Wiki Activity
1440 commits 15 branches 6 tags 33 MiB
Commit graph

1286 commits

Author SHA1 Message Date
Ellpeck
549402d98e The laser relay has less particles again now. 
As it was lagging games.
 2016-05-13 17:05:47 +02:00
Ellpeck
41027a07c2 Fixed a massive console spam issue of Whitelisted Item Laser Relays trying to sync client->client 2016-05-13 16:58:16 +02:00
Ellpeck
dcd41a016a Make tile entity updating not send null packets causing console spam 2016-05-12 19:37:31 +02:00
Ellpeck
3ad6b1c7cb Made Item Laser relays that have a whitelist have more priority than those who don't 2016-05-12 19:00:42 +02:00
Ellpeck
8e93abf05a Made Placers be able to place anything again. 
Yes. Really.
 2016-05-12 18:48:13 +02:00
Ellpeck
43c93f2e51 How didn't it bug me that this wasn't centered? 2016-05-12 14:28:22 +02:00
Ellpeck
95d2e226e3 So this isn't needed anymore 2016-05-12 14:27:29 +02:00
Ellpeck
bfd859e144 Replace Growth Ring's constant NBT updating with world time checking 2016-05-12 14:26:10 +02:00
Ellpeck
2fe50c71aa Safer check 2016-05-11 21:00:26 +02:00
Ellpeck
58e5af0814 Less processing of whitelist 2016-05-11 20:59:38 +02:00
Ellpeck
a8717e6191 Changed some advanced laser relay functionality 2016-05-11 20:55:29 +02:00
Ellpeck
44ed2dcda1 Made some info on the item system clearer 2016-05-11 20:44:21 +02:00
Ellpeck
6e96964db8 Item viewer texture 2016-05-11 19:39:59 +02:00
Ellpeck
7a0ba8819d Item Storage recipes and doc 2016-05-11 19:30:19 +02:00
Ellpeck
40d02814ea Fixed sounds not working on servers 2016-05-11 15:28:46 +02:00
Ellpeck
54c618231f Made booklet sometimes not type a letter into the search box when pressing C 2016-05-10 22:36:53 +02:00
Ellpeck
c4a94a0724 Merge branch 'patch-7' of https://github.com/Kristian295/ActuallyAdditions 2016-05-10 22:31:22 +02:00
Ellpeck
ea1c65bbb3 Added whitelistable advanced item laser relays 2016-05-10 22:19:15 +02:00
Ellpeck
b75837d6b2 Changed some stuff around in Drill's container to match TileInventoryBase's sorting 2016-05-10 20:49:17 +02:00
Ellpeck
a7a76cc861 Dang it, now it's right 2016-05-10 19:00:35 +02:00
Ellpeck
1c9038d703 Made the smiley cloud not continuously mark dirty 2016-05-10 18:57:26 +02:00
Ellpeck
3b0b6dab54 Made ActAdd Java 6 compatible. 
Yea.
 2016-05-10 18:48:35 +02:00
Ellpeck
f034a14a69 Some cleanup ~ 2016-05-10 18:37:00 +02:00
Ellpeck
b0ecc87a23 Reworked item system a bit to allow for black- and whitelisting 2016-05-09 19:05:20 +02:00
Ellpeck
b4fde39a33 Item Phantom Networks, part 1 2016-05-08 21:09:58 +02:00
Ellpeck
9c40296db0 Spawner Shards + Spawner Changer recipe and doc 2016-05-08 14:11:24 +02:00
Ellpeck
2c6b2dae77 Just in case 2016-05-08 11:07:19 +02:00
Ellpeck
c7f5455862 Spawner Changer 2016-05-08 02:55:59 +02:00
Ellpeck
8e8b59034b This doesn't make any sense 2016-05-07 23:43:14 +02:00
Ellpeck
1f6f3152ed Added max damage display to the advanced tooltip 2016-05-07 23:38:50 +02:00
Ellpeck
19d11e783b Removed unneded parts of the InvTweaks API. 
Why did I have these again..?
 2016-05-07 21:36:41 +02:00
Ellpeck
bddce5fcd6 Fix the fix 2016-05-07 20:24:56 +02:00
Ellpeck
9d1cb8e45a Fixed a bug with fluid placers replacing fluids in front of them 2016-05-07 20:23:50 +02:00
Ellpeck
4b548dd0a9 Re-implemented village structures 
Villager and chest still to go
 2016-05-07 12:55:59 +02:00
Ellpeck
95fa796e92 Cleanup! ~ 2016-05-07 02:49:03 +02:00
Ellpeck
89963a23fb Replaced bucket slots in GUIs with right click functionality 2016-05-06 23:23:29 +02:00
Ellpeck
b8e08d582b Add new buckets to creative 2016-05-06 22:27:38 +02:00
Ellpeck
1695f61a75 Use universal buckets 2016-05-06 22:23:41 +02:00
Ellpeck
f942810592 What did that even mean? 2016-05-06 18:38:56 +02:00
Ellpeck
3e6a18729d Reconstructor module recipe and doc 2016-05-06 16:29:49 +02:00
Ellpeck
f21fa7e317 Added Reconstruction Module as Rarmor integration 2016-05-06 16:11:26 +02:00
Ellpeck
1c0fb786b2 Update JEI and add some new features like seeing the items the recipe works with at the top 2016-05-06 14:50:15 +02:00
Ellpeck
3f4f87f273 Added a method to get the API Version as an integer to the API 2016-05-06 14:19:25 +02:00
Ellpeck
73ebec3930 Gave color changing more freedom. 
Bump API version to 10
 2016-05-06 12:26:41 +02:00
Ellpeck
d842367252 all teh moneyz 2016-05-06 10:55:51 +02:00
Ellpeck
7afa319b5c Changed storage crate recipe. 
Closes #92.
 2016-05-05 20:52:32 +02:00
Ellpeck
06ede0c822 Made color lens more modular by adding a way to colorize items to the API. 
API Version bumped to 9.
 2016-05-05 19:50:59 +02:00
Ellpeck
727fb1fc24 Remove sout 2016-05-05 17:51:36 +02:00
Ellpeck
9d04c236c7 Made the Phantom Redstoneface not update twice when binding to an already active redstone 2016-05-05 17:50:18 +02:00
Ellpeck
6a0d4ca611 Redstoneface recipe and doc 2016-05-05 17:37:12 +02:00
Ellpeck
b6a02d8189 Added Phantom Redstoneface 2016-05-05 17:29:39 +02:00
Ellpeck
9a8d38f5da I don't know why this was even here 2016-05-05 16:58:05 +02:00
Ellpeck
11bc13aefd Added InvWrapper Capabilities to inventories 2016-05-05 13:43:57 +02:00
Ellpeck
b3729703b7 Made directional breaker need energy in pulse mode. 
Duh.
 2016-05-05 13:22:58 +02:00
Ellpeck
5f3e8fc748 Added a default extra whitelist config option for the Item Repairer 
Closes #85
 2016-05-05 10:01:15 +02:00
Ellpeck
74c16757f8 Some fixes 2016-05-05 00:06:02 +02:00
Ellpeck
5b9f668d14 Made double furnace and double crusher use the double amount of energy if both items are smelting 2016-05-04 22:40:58 +02:00
Ellpeck
eb8b6cd06c Merge remote-tracking branch 'origin/master' 2016-05-04 17:48:05 +02:00
Ellpeck
ca91ef4d24 Added the ender star which is a new crafting ingredient 2016-05-04 17:47:54 +02:00
Ellpeck
78bfbc6208 Rename itemCrystalLightBLue.json to itemCrystalLightBlue.json 2016-05-04 16:36:43 +02:00
Ellpeck
0b9101398a Rename itemPotionRIng.json to itemPotionRing.json 2016-05-04 16:36:34 +02:00
Ellpeck
a8365724f8 Made harvestdropevents be posted when mining blocks automatically 2016-05-04 13:15:30 +02:00
Ellpeck
4b0ef298da Fixed laser relays making no particles when the less particles setting is on 2016-05-04 12:59:36 +02:00
Ellpeck
2352e3be31 Fixed oredict creating empty entries when searching for names 2016-05-04 12:19:02 +02:00
Ellpeck
f50c9f32c1 fixed mcmod.info being broken 2016-05-03 22:12:16 +02:00
Ellpeck
1aeea1ef6d Unload the fake player when leaving a world so that it doesn't persist and break stuff 2016-05-03 21:32:51 +02:00
Ellpeck
af8356c9ef Fixed Fluid Placer not being able to place 2016-05-03 21:31:54 +02:00
Ellpeck
16c2c22cf7 Finished models 2016-05-03 21:26:02 +02:00
Ellpeck
15c65216cd Some more model work 2016-05-03 18:29:02 +02:00
Ellpeck
6e18866c79 Fixed equipment slot in energizer and enervator being off 2016-05-03 08:45:01 +02:00
Ellpeck
d6bc78fffb Started work on forge block models. 
Could still take a while though.
 2016-05-02 22:16:58 +02:00
Ellpeck
9ab94e5701 this 2016-05-02 17:46:53 +02:00
Ellpeck
928676ea53 cleanup 2016-05-02 17:12:31 +02:00
Ellpeck
1757f38bd1 Fixed most bounding boxes 2016-05-02 17:09:23 +02:00
Ellpeck
5aa63f2822 Made slab placing a bit more proper 2016-05-02 16:56:27 +02:00
Ellpeck
2599715973 Items are now held properly! \o/ 2016-05-02 16:42:04 +02:00
Ellpeck
bfc68919f3 Fixed a couple of bugs with items that need to be held not working 2016-05-02 07:50:13 +02:00
Ellpeck
eed5cbdc92 4 ATTACK DAMAGE WHEN ON FEET 2016-05-01 22:37:27 +02:00
Ellpeck
98299708d5 I checked that 2016-05-01 22:34:40 +02:00
Ellpeck
cb9db8b4f2 Raised the amount of particles from the laser relay as the total amount of allowed particles has been raised by a lot 2016-05-01 22:30:54 +02:00
Ellpeck
a545eaa008 Fixed sounds 2016-05-01 22:26:26 +02:00
Ellpeck
61d7b783b3 Made XP drops from drill dependent on the forge event 2016-05-01 10:33:40 +02:00
Ellpeck
d2a5f3bb17 Made drill be openable again. Closes #89 2016-05-01 10:29:34 +02:00
Ellpeck
5faa779725 fixed blocks dropping twice when broken with the drill 
Closes #88
 2016-04-30 20:14:01 +02:00
Ellpeck
e267d0110d Fixed a bug causing the player to be unable to fill buckets 2016-04-29 19:31:33 +02:00
Ellpeck
3cd7512ed6 r27! 2016-04-20 21:54:59 +02:00
Ellpeck
08ea43e70d Fudge my life, 1.9 2016-04-20 21:39:03 +02:00
Ellpeck
23f8ccc75c Did some more stuff and things 2016-03-19 15:10:20 +01:00
Ellpeck
5d34bce194 Fixed Drill attack damage 2016-03-19 11:42:11 +01:00
Ellpeck
0499fbdf7f Made the game actually run 2016-03-19 11:36:17 +01:00
Ellpeck
1e2732195d 1.9. 
Fuck my face.
 2016-03-18 23:47:22 +01:00
Ellpeck
6d1878deb3 Made the log not die of spamming 2016-03-18 20:39:24 +01:00
Ellpeck
2b12947e2c Changed Fake Player's name 2016-03-18 20:36:41 +01:00
Ellpeck
54c0884b03 Moved recipe getting to recipeUtil 2016-03-18 18:41:37 +01:00
Ellpeck
dc8ad581ad Cleaned up some registry 2016-03-18 18:38:39 +01:00
Ellpeck
9720381540 Okay, okay, okay, it's fine. 
It was a stupid feature.
I understand. So shut up now.
 2016-03-18 18:19:51 +01:00
Ellpeck
56f9402fde Whoever made the items float? 2016-03-18 18:16:25 +01:00
Ellpeck
7a236aa2b3 Cleaned up Laser Relay Connections and WorldData a bit 2016-03-18 16:13:09 +01:00
Ellpeck
9fc5735985 ESD is done 2016-03-18 16:02:27 +01:00
Ellpeck
efdb43bd5a Let's do this differently, so that you can actually close the book at all when the search field is up 2016-03-18 16:00:36 +01:00
Ellpeck
92172c0fdc Close book with inventory key 2016-03-18 15:55:55 +01:00
Ellpeck
1d27f6e52d I don't want this differentiated 2016-03-18 15:48:52 +01:00
Ellpeck
8ba1d23eff Replaced some method calls 2016-03-18 15:42:06 +01:00
Ellpeck
47568e5fbc Fudge the new item system stuff 2016-03-18 15:31:59 +01:00
canitzp
81130ac0b9 Fixed Phantomface Crash Closes #82 2016-03-15 19:28:54 +01:00
Ellpeck
46d9ad9a10 P's edition 2016-03-08 00:05:34 +01:00
canitzp
9afe9b5a8b Rename itemHoeCrystalblue.json to itemHoeCrystalBlue.json 2016-02-20 21:38:28 +01:00
canitzp
c93276835e Blame on Shadowfacts 2016-02-20 21:25:18 +01:00
Ellpeck
33e231d265 Fixed Canitz' mess. 
Cleanup~
 2016-02-20 16:16:41 +01:00
canitzp
d729f55832 New Compost Rendering 2016-02-20 15:23:03 +01:00
canitzp
967d180cca Replaced some Method calls 2016-02-19 19:58:26 +01:00
canitzp
51de083209 Added a Nullcheck 2016-02-18 22:48:53 +01:00
canitzp
f0d7585fd9 Fixed JEI Booklet Page Rendering Closes #71 2016-02-18 22:33:44 +01:00
canitzp
c0d13ef30f Fixed Double Plant Crash Closes #70 2016-02-18 21:58:19 +01:00
canitzp
353431827f Fixed Double Plant Crash Closes#70 2016-02-18 21:55:37 +01:00
canitzp
8be363ba08 Hopefully fixed a Miner Bug 2016-02-18 18:43:35 +01:00
canitzp
57c37cb900 Rewrite the SmileyCloud Renderer 2016-02-17 23:15:56 +01:00
canitzp
0600c56355 Reactivated AtomicReconstructor Lens Renderer 2016-02-17 21:45:19 +01:00
canitzp
1664ce22e3 Reactivated AtomicReconstructor Lens Renderer 2016-02-17 21:45:02 +01:00
canitzp
b9262df154 Fixed the Tool JSONs 2016-02-17 20:32:02 +01:00
canitzp
6819c6b34b Updated to the official RF-Api for 1.8 2016-02-16 21:49:44 +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
Ellpeck
ef07e2d725 Revert #72. 
Text is too long for the pages.
 2016-02-09 18:29:48 +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
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
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
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