Commit graph

1003 commits

Author SHA1 Message Date
Ellpeck
bea1b4e798 Fix a crash with the chest to crate upgrade
Closes #499
2016-12-18 11:21:55 +01:00
Ellpeck
6940da51f3 Merge remote-tracking branch 'origin/master' 2016-12-11 20:52:54 +01:00
Ellpeck
84df42aec9 Add drops to event list
Closes #480
2016-12-11 20:52:47 +01:00
Derpy Hooves
5dbfb574be Changed quoted player @KarillEndusa (#477)
pickedy pockedy picky
2016-12-10 18:08:55 +01:00
Ellpeck
1a0fd8887d Replace particles with laser renderers. Woop woop! 2016-12-09 21:36:43 +01:00
Ellpeck
8d670da900 Don't mark this dirty here
Closes #472
2016-12-08 22:20:45 +01:00
Ellpeck
b6f1f67d12 Fix the item distributor on this branch as well
Closes #469
2016-12-08 21:19:10 +01:00
Ellpeck
91170ea432 Fixed the dropper dropping into unloaded chunks
Closes #465
2016-12-08 14:25:16 +01:00
Ellpeck
91dc0f4ce1 You can now change the booklet's font size in the lang file
Closes #461
2016-12-07 15:25:04 +01:00
Ellpeck
b0d3ee66a2 elu pls 2016-12-07 13:59:30 +01:00
elucent
c3ef81ff5f Laser Rendering Improvements (#462)
* Improved laser rendering.

* Removed unused import.
2016-12-07 13:56:17 +01:00
Ellpeck
f937673483 Made the miner a little less resource heavy 2016-12-06 20:06:40 +01:00
Ellpeck
935e928f22 Revert: Added portable jukebox 2016-12-06 18:10:43 +01:00
Ellpeck
a924004f10 Added portable jukebox 2016-12-06 16:28:42 +01:00
Ellpeck
28eb55582f Turn down Empowerer particles a bit more.
Closes #455
2016-12-06 13:55:30 +01:00
Ellpeck
ee99b1fccc Make the Leaf Blower work with all shearable things
Closes #456
2016-12-06 13:40:51 +01:00
Ellpeck
7c0ca04e85 missing else :v 2016-12-06 08:19:32 +01:00
Ellpeck
c9ffb0c630 Fix Laser Relay page pictures
Closes #454
2016-12-05 23:23:26 +01:00
Ellpeck
191572c12a Added Direwolf's spotlight to the book 2016-12-05 21:48:45 +01:00
Ellpeck
3b7cf5d7c9 Change this to also respect new method 2016-12-05 17:18:00 +01:00
Ellpeck
9b7177fbe9 Update forge 2016-12-05 17:10:23 +01:00
Ellpeck
e2c8b335c6 Fix a crash with the Miner
Closes #447
2016-12-05 15:27:01 +01:00
Ellpeck
5776ac2fa0 Added Laser Relay in/out config 2016-12-05 15:09:37 +01:00
Ellpeck
1de62f5dc7 Make fluid handlers side independent 2016-12-05 14:16:53 +01:00
Ellpeck
413d0dc6fa Fix the placer not working
Closes #451
2016-12-05 14:11:20 +01:00
Ellpeck
4c41295131 Added nether wart to the farmer 2016-12-04 16:15:32 +01:00
Ellpeck
1dd7479808 Farming cactus + nice description 2016-12-04 15:36:14 +01:00
Ellpeck
9552c112b0 Added the ability to add custom farmer behaviors to the API 2016-12-04 15:03:01 +01:00
Ellpeck
6d194879bf Hardcode villager trades
Closes #427
2016-12-04 13:27:06 +01:00
Ellpeck
e119f58714 raoul 2016-12-04 13:11:45 +01:00
Ellpeck
a24205542a Some more quotes from DW's spotlight comments <3 2016-12-04 13:05:14 +01:00
Ellpeck
c7697b5665 Dropped IInventory support.
This took ages.
2016-12-04 00:10:52 +01:00
Ellpeck
cc3a3d60cd Made the reconstructor convert without needing blocks. 2016-12-03 13:29:20 +01:00
Ellpeck
d410c7c295 I finally give in. Made the crusher quieter. 2016-12-03 12:34:49 +01:00
Ellpeck
14c776df1b Fix the fermenting barrel crashing with a missing compound when placing sometimes
Actually fixes #437
2016-12-03 12:31:17 +01:00
Ellpeck
fc4484cc73 Fix a crash that sometimes happens when placing down container blocks
Closes #437
2016-12-03 12:29:49 +01:00
Ellpeck
073eb2168a Fix the reconstructor never using more than 1000 RF 2016-12-03 12:26:45 +01:00
Ellpeck
348b3521f6 Made Filters be consumed when placing them into filter slots 2016-12-03 10:52:03 +01:00
Ellpeck
2219014fa2 Made the double furnace be able to accept more energy 2016-12-01 18:42:24 +01:00
Ellpeck
fba447376b Made Laser Relays not try to input back into the thing they got energy from
Closes #425
2016-12-01 18:16:01 +01:00
Ellpeck
cfd6506eb3 Make only the coffee machine and coal generator return their container item
Closes #426
2016-12-01 18:07:42 +01:00
Ellpeck
7c0c366e43 Removed crafting configs.
Use MineTweaker pls
2016-11-30 17:05:49 +01:00
Ellpeck
d70b37b528 Made advanced tooltips only show with advanced tooltips enabled
You can shut up now raoul
2016-11-29 22:34:46 +01:00
Ellpeck
95d2fa45ec Made item intersion on the farmer more specific 2016-11-29 21:57:36 +01:00
Ellpeck
b43886d954 Fix this on 1.11 too, closes #421 for good 2016-11-29 21:53:07 +01:00
Ellpeck
b4c912b4e1 Also fixed fog bug in 1.11
Closes #420
2016-11-29 20:44:07 +01:00
Ellpeck
962d1b3842 Re-added special people stuff for 1.11 tempoarily 2016-11-28 22:04:19 +01:00
Ellpeck
5694d4f8da Make the heat collector a little more rare to pick up lava 2016-11-28 13:17:20 +01:00
Ellpeck
ca38b43b67 Fermenting barrel comparator output 2016-11-28 13:11:29 +01:00
Ellpeck
af3ef16975 Coal generator comparator output 2016-11-28 13:02:42 +01:00
Ellpeck
cfd7ec41df Oil Generators respond to comparators 2016-11-28 12:51:45 +01:00
Ellpeck
26a3e02044 Made the coal generator turn off able with redstone too 2016-11-28 07:48:42 +01:00
Ellpeck
38d0bb17f9 Machines primus 2016-11-27 23:04:26 +01:00
Ellpeck
56898a95db Made the power bar on items colorful too \o/ 2016-11-27 21:53:16 +01:00
Ellpeck
72c1c276cf Fix the farmer having wrong rotations 2016-11-27 20:25:09 +01:00
Ellpeck
8226479ce8 Fix a crash with energy phantomfaces and tesla 2016-11-27 19:32:14 +01:00
Ellpeck
86aeada330 fix an exception on loading some tileentities 2016-11-27 19:04:22 +01:00
Ellpeck
694f9f5e8d make this a bit nicer 2016-11-27 13:29:58 +01:00
Ellpeck
45d30b82de Check if the block is loaded when spawning a firework
Supposedly closes #416
2016-11-27 12:29:29 +01:00
Ellpeck
35daf62fde Made Greenhouse Glass twice as fast 2016-11-27 12:08:58 +01:00
Ellpeck
65e443e13b Added enabling/disabling the magnet ring 2016-11-27 11:56:22 +01:00
Ellpeck
03a0588faf Buffed oil a little 2016-11-27 11:48:28 +01:00
Ellpeck
142a07f783 Made filter slots be ignored by comparators and stuff 2016-11-27 11:37:55 +01:00
Ellpeck
0b1cb80931 Fix the item repairer crashing with certain items
Closes #415
2016-11-27 10:46:48 +01:00
Ellpeck
adad967c02 Finally updated all the mappings 2016-11-26 21:32:28 +01:00
Ellpeck
f469f77f4f Drop that RF, like a big fat rock 2016-11-26 20:43:50 +01:00
Ellpeck
a70468ff72 fix a crash on startup with energy items 2016-11-26 19:02:59 +01:00
Ellpeck
b9a84481d1 Added Forge Units support to everything 2016-11-26 19:00:02 +01:00
Ellpeck
3176bafd2b Removed putting batteries in drills because of battery discharge mode 2016-11-26 18:28:14 +01:00
Ellpeck
a910989501 marking item viewer derpy 2016-11-26 18:15:29 +01:00
Ellpeck
550f072b5a Make this clearer 2016-11-26 15:47:04 +01:00
Ellpeck
98627341d4 Added nice crystal flux renderer~ 2016-11-26 15:09:15 +01:00
Ellpeck
cc5e517a1d Added FU as an option to the energy display 2016-11-26 09:36:19 +01:00
Ellpeck
c334b31761 support fricker units 2016-11-26 08:58:42 +01:00
Ellpeck
65bc4ce327 Fix a crash with filter slots crashing 2016-11-25 22:05:45 +01:00
Ellpeck
bc220573e8 Added display tool tip to bags
Closes #407
2016-11-25 22:05:19 +01:00
Ellpeck
6955188d7b *Actually* fixed Item Laser Relays leaving phantom connections behind 2016-11-25 15:33:47 +01:00
Ellpeck
f7f68e4f16 Fix Phantom Laser Connections whenever breaking a laser that's directly connected to an Item Interface 2016-11-25 15:18:14 +01:00
Ellpeck
9b2628e9aa Fix an energy dupe bug with batteries 2016-11-23 18:25:08 +01:00
Ellpeck
3ed5e9cc8a Added internal energy methods to avoid things only using energy up to their cap 2016-11-23 18:10:55 +01:00
Ellpeck
377973fc9c Added lens whitelist and blacklist
Closes #399
2016-11-23 17:46:08 +01:00
Ellpeck
ded8ceb529 Fixed fluid containers emptying giving you back nothing
Closes #401
2016-11-23 17:16:43 +01:00
Ellpeck
e745ebdc28 Made the laser relay work with just right-click
Closes #400
2016-11-23 16:55:39 +01:00
Ellpeck
39a72e176b Added page sorting for the booklet 2016-11-22 22:54:35 +01:00
Ellpeck
b57da71627 Move most recipes to postInit again
Closes #398
2016-11-22 22:25:46 +01:00
Ellpeck
b5caedfeec Fixed the drill replacing itself
Closes #394
2016-11-22 19:52:33 +01:00
Ellpeck
6f90197087 Finished wing exhaustion mechanic 2016-11-22 19:35:52 +01:00
Ellpeck
2671cad420 Added flight limit to wings of the bats 2016-11-22 18:26:29 +01:00
Ellpeck
c7912a01d7 Make the lens of the killer actually drop player only drops
Closes #389
2016-11-22 08:40:11 +01:00
Ellpeck
73d3dc95bc Made potion rings require blaze and work in the off hand 2016-11-22 00:11:58 +01:00
Ellpeck
b482bdd1fe actually 2016-11-21 22:52:25 +01:00
Ellpeck
9f2bd27e6c shut up please 2016-11-21 22:45:27 +01:00
Ellpeck
a0541d1160 Made the oil generator turn-off-able with redstone
Closes #384
2016-11-21 21:19:10 +01:00
Ellpeck
e65874a4ce Engineer house doc 2016-11-21 21:04:14 +01:00
Ellpeck
0f86d83e72 Make Item Repairer and Miner use a little less power
(I guess?)
2016-11-21 20:25:32 +01:00
Ellpeck
b24aaa7601 You won't believe how much this annoyed me 2016-11-21 20:17:35 +01:00
Ellpeck
dd710b4dbe Made dungeon loot config also disable loot in villages 2016-11-21 20:16:13 +01:00
Ellpeck
de2b6a8bef Add engineer chest dungeon loot, fix some stuff 2016-11-21 18:56:28 +01:00
Ellpeck
9708a9a767 Added engineer and crystallizer villager 2016-11-21 17:50:33 +01:00
Ellpeck
0dc3dd7d1a Change to using proper blockstates 2016-11-21 16:23:48 +01:00
Ellpeck
12c7acf3f3 Added items to engineer house chest 2016-11-21 14:56:45 +01:00
Ellpeck
58b90f66c3 Added push/pull caps to all machines 2016-11-21 13:45:23 +01:00
Ellpeck
309733f096 Changed some energy item values around 2016-11-21 13:38:43 +01:00
Ellpeck
dd7e522605 Made the Oil Generator scale per time, not per energy 2016-11-21 13:30:38 +01:00
Ellpeck
32b757d71f Up the chance and also fix a name 2016-11-20 23:55:58 +01:00
Ellpeck
824b444b51 Added engineer's house.
Still needs items and stuff like that.
2016-11-20 23:52:40 +01:00
Ellpeck
3ec92ed4c4 Made the Farmer add seeds back into the seed slots 2016-11-20 20:23:33 +01:00
Ellpeck
954df33f61 Change to using Nonnulllist so that things work 2016-11-20 20:13:26 +01:00
Ellpeck
75a3a91e65 remove old stuff that isn't really a thing anymore 2016-11-20 17:26:10 +01:00
Ellpeck
5b4efb287d Mark the solidifier dirty 2016-11-20 15:47:33 +01:00
Ellpeck
3fd96cf237 Made the lens of death disableable
Closes #377
2016-11-20 15:06:17 +01:00
Ellpeck
af7d0d2f1d Made the achievement and config button appear right away after the tutorial
Closes #380
2016-11-20 14:51:21 +01:00
Ellpeck
504835246c Named all containers.
Closes #383
2016-11-20 13:46:35 +01:00
Ellpeck
0710aab830 Made the amount of loot generated in custom chests higher 2016-11-20 13:26:36 +01:00
Ellpeck
b39ee8228d Replace chests in village houses and lush caves with storage crates.
Also closes #382
2016-11-20 13:22:36 +01:00
Ellpeck
659d424467 Fix the villager texture being missing 2016-11-20 12:06:28 +01:00
Ellpeck
ad0c294915 added dungeon loot to woodland mansions 2016-11-20 03:59:31 +01:00
Ellpeck
bfd7c0fa1f THIS IS A REALLY HUGE COMMIT HI 2016-11-20 03:44:49 +01:00
Ellpeck
2a13f43378 Add draconium to the mining ore lens list 2016-11-20 00:09:37 +01:00
Ellpeck
d872b92751 forgot these 2016-11-19 23:14:17 +01:00
Ellpeck
5d624c7c50 snake_cased all items and their names 2016-11-19 23:12:22 +01:00
Ellpeck
07b97ada87 Added messy, but functional, remapper 2016-11-19 21:54:43 +01:00
Ellpeck
ec8c642099 1.11, first step. 2016-11-19 21:11:17 +01:00
Ellpeck
483d20ff99 Fixed Energy Laser Relays causing endless power loss when transferring very small amounts of RF
Closes #375
2016-11-19 10:08:47 +01:00
Ellpeck
1fc5320be6 Fixed an Empowerer dupe bug 2016-11-18 23:14:49 +01:00
Ellpeck
953bb7499d Rebalanced food a little bit 2016-11-18 22:07:32 +01:00
Ellpeck
4666f6d4ea Fixed the bag "leaking" items
Closes #373
2016-11-18 20:52:33 +01:00
Ellpeck
0481a56794 Added some more dungeon loot 2016-11-18 20:30:49 +01:00
Ellpeck
ee85dd3ba8 Fix a crash with the laser relay
Closes #371
2016-11-18 06:40:08 +01:00
Ellpeck
3ce31d09fd Fix a coffee machine dupe bug
Closes #372
2016-11-18 06:37:28 +01:00
Ellpeck
5c5ea915c1 Made the config and achievements button only show when the tutorial is done so that it doesn't get cut off by the tutorial button 2016-11-17 20:27:33 +01:00
Ellpeck
4009cec2ef Undo the bad decision part 2 2016-11-17 20:23:20 +01:00
Ellpeck
7ae35e05a9 Made picture pages not suck 2016-11-17 18:03:37 +01:00
Ellpeck
74cd597407 Added updates and infos section
Very meta, very self-advertisement-y.
2016-11-17 18:00:26 +01:00
Ellpeck
c8f4c94c94 Added back config, achievements and view online button 2016-11-17 17:36:00 +01:00
Ellpeck
95ca15cd1a Set the item in the current hand instead of the current slot
Should close #324
2016-11-17 16:31:05 +01:00
Ellpeck
4231bbf557 added quotes to main page 2016-11-17 16:25:47 +01:00
Ellpeck
346b0b54f7 Added filter mod mode 2016-11-17 14:56:26 +01:00
Ellpeck
31bbbe2902 Change the description text of Phantomfaces 2016-11-16 22:34:15 +01:00
Ellpeck
cb99c7859e Make the empowerer particles respond to the particle option
Closes #364
2016-11-16 22:15:58 +01:00
Ellpeck
b2372d4231 Adapt code to resource rename 2016-11-16 21:56:47 +01:00
Ellpeck
36c176dd2e Cleanup and some more validation checks ~ 2016-11-16 20:31:16 +01:00
Ellpeck
2ab8288282 Moved recipe inits to init, made the booklet JEI handler show all crafting options 2016-11-16 19:08:56 +01:00
Ellpeck
53f6ce0a24 Add Laser Relay priorities 2016-11-16 18:51:23 +01:00
Ellpeck
b355a66c97 Fix auto split 2016-11-16 17:06:53 +01:00
Ellpeck
6e34f9e345 This only took 20 years
Prepared for 1.11 ItemStack updates
2016-11-16 16:59:00 +01:00
Ellpeck
a94a49f9c9 Don't cache the parent screen! 2016-11-15 19:28:51 +01:00
Ellpeck
e1ec9e4afb Tweaks to the laser relay renderer
Closes #360
2016-11-14 15:30:06 +01:00
Ellpeck
6cdf74cd88 Added ore to gem crushing if no dust can be found
Closes #359
2016-11-14 15:11:46 +01:00
garantiertnicht Weichware
a89bfa5001 Make the Teleportation Stuff use Vanilla Cooldown rather than Own one (#350) 2016-11-13 12:38:17 +01:00
Ellpeck
83e85b4ac3 Made booklet chapters initialize in init instead of postinit 2016-11-12 23:29:36 +01:00
Ellpeck
d058878d30 Changed addTextReplacement to also accept ints 2016-11-12 23:10:41 +01:00
Ellpeck
83eb47787f Added back the addTextReplacement thing :v 2016-11-12 22:55:07 +01:00
Ellpeck
6648fb29e2 Made bookmark buttons only open when the page isn't already open 2016-11-12 16:17:11 +01:00
Ellpeck
ecafafe57e Fix a crash when typing in the search bar ~ 2016-11-12 16:06:30 +01:00
Ellpeck
05322f1392 Added display tips to the booklet 2016-11-12 15:48:24 +01:00
Ellpeck
931eba4cc4 API restored! ~ 2016-11-12 15:13:20 +01:00
Ellpeck
c983836f8d Finished up the new booklet.
Woo-hoo!
2016-11-12 15:09:30 +01:00
Ellpeck
19cfcfa1c1 Added bookmarks and store page and bookmarks on close 2016-11-12 13:54:49 +01:00
Ellpeck
0327ee9a26 Added search bar 2016-11-12 12:26:36 +01:00
Ellpeck
30849fb304 Finished all page types 2016-11-12 00:29:01 +01:00
Ellpeck
5507e2ce60 Changed player data to use variables instead of NBT 2016-11-11 21:41:07 +01:00
Ellpeck
c85a3c72a1 Some more booklet work 2016-11-11 21:07:18 +01:00
Ellpeck
81584c2fb1 B U T T O N S 2016-11-11 18:55:32 +01:00
Ellpeck
24e2a9e88d Finished crafting page. 2016-11-11 16:37:45 +01:00
Ellpeck
12abe6f6f6 Removed booklet word counting 2016-11-11 15:24:24 +01:00
Ellpeck
2760c794d6 Made the all items chapter use all chapters on its own 2016-11-11 15:21:57 +01:00
Ellpeck
b295672585 Added basic item display system and crafting page 2016-11-10 23:37:40 +01:00
Ellpeck
4a739b6ab4 Text pages! 2016-11-10 22:06:58 +01:00
Ellpeck
8c7bd9e696 //TODO invasion 2016-11-10 21:07:15 +01:00
Ellpeck
f35a041a55 Booklet rework, part 1.
This is an API breaking change, by the way.
2016-11-10 19:50:01 +01:00
Ellpeck
66aec5cfdf Allow plants to be planted on blocks other than farmland with the farmer
Closes #346
2016-11-10 16:38:37 +01:00
Ellpeck
20664fccf4 Make the Phantom Itemface work with IItemHandler only blocks.
Closes #299
2016-11-09 21:36:18 +01:00
Ellpeck
6cce2d47cf Center me senpai 2016-11-09 19:34:20 +01:00
Ellpeck
42784df86e Move laser stuff to a dedicated chapter
Closes #341
2016-11-09 19:26:53 +01:00
Ellpeck
c471f19f87 Remove this down to ensure reset 2016-11-08 23:52:31 +01:00
Ellpeck
3ad1da0a8c Made the bookler clear its search bar when opening a chapter 2016-11-08 23:48:25 +01:00
Ellpeck
57f16ec321 Update JEI 2016-11-08 23:35:11 +01:00
Ellpeck
691fabd5ef Finished new laser relay models 2016-11-08 23:04:05 +01:00
Ellpeck
9d7d7bd3fc Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java
2016-11-08 20:05:19 +01:00
Ellpeck
c129f6138d Sweepededeep~ 2016-11-08 20:04:36 +01:00
garantiertnicht Weichware
b5ecbb982a Make Item Filler work with Bocks that only have meta when placed in world. (#340)
* Made Filler Wand work with Meta you cant obtain in your inventory, and removed unused- and unexisting imports from the Laser Relay Tile Entity

* Revert "Made Filler Wand work with Meta you cant obtain in your inventory, and removed unused- and unexisting imports from the Laser Relay Tile Entity"
I dont think I should touch imports, so I revert this commit and re-commit only the ItemFiller.

This reverts commit e71769d7d7.

* Made Filler Wand work with Meta you cant obtain in your inventory (again)
2016-11-08 18:22:08 +01:00
Ellpeck
1a9a69a4bd Removed the laser wrench setting
Closes #339
2016-11-08 13:25:36 +01:00
Ellpeck
9337a6e6aa Added proper laser rendering instead of the particles 2016-11-08 08:53:30 +01:00
Ellpeck
2e96e00182 Made worms work with other grass and dirt types too. I hope.
Closes #338
2016-11-07 22:52:54 +01:00
Ellpeck
5c5829d503 Made the precision dropper mark dirty and such respond to comparators correctly
Closes #331
2016-11-07 20:10:04 +01:00
Ellpeck
9e31e0c404 Made the ranged collector show particles when picking items up 2016-11-07 20:07:37 +01:00
Ellpeck
14255ea801 removed performance config options. Yea, really. 2016-11-07 19:58:34 +01:00
Ellpeck
3e8d89c390 Made the magnet ring even more useful by making it pick up items directly 2016-11-07 18:02:06 +01:00
Ellpeck
cc554241f7 Made XP created by solidified XP not be picked up by the solidifier 2016-11-07 17:48:02 +01:00
Ellpeck
9282462a9a Added some more easter egg names to the smiley cloud~ 2016-11-07 00:00:05 +01:00
Ellpeck
642ff7b965 Made lush caves generate higher up too again 2016-11-06 17:12:49 +01:00
Ellpeck
e469c1d634 Made the AIOT work with spider webs
Closes #328
2016-11-06 15:30:04 +01:00
Ellpeck
eb3e6611db Additional Addons (Xathz) 2016-11-05 20:45:11 +01:00
Ellpeck
add64ce9ea Finished handheld filler
Closes #316
2016-11-05 16:16:42 +01:00
Ellpeck
584f6bc034 Filling thing, part 1 2016-11-05 15:36:16 +01:00
Ellpeck
bb9a8c0512 Made the AIOT able to make both farmland and paths
Closes #323
2016-11-05 13:41:49 +01:00
Ellpeck
149592cafa picky 2016-11-04 21:35:05 +01:00
Josh
393d8c8395 Redoing text for configs (#318) 2016-11-04 21:27:20 +01:00
Ellpeck
5b5e261181 It's EdwardR's fault 2016-11-03 22:43:40 +01:00