Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-27 09:18:35 +01:00
Code Issues Projects Releases Wiki Activity
1919 commits 14 branches 4 tags 33 MiB
Commit graph

1716 commits

Author SHA1 Message Date
Ellpeck
b0e96caaf1 Added config option for tiny coal and charcoal block 
Closes #163
 2016-07-22 11:06:05 +02:00
Ellpeck
9140b39f65 Fixed the energy bar turning green when holding a redstone torch 2016-07-22 00:58:39 +02:00
Ellpeck
a4b54919b9 What the fuck, darkhax!? 2016-07-21 23:50:09 +02:00
Ellpeck
e526c7bfd0 Stop whining, canitzp 2016-07-21 23:02:06 +02:00
Ellpeck
ecfdb9a555 Pretend this never happened please 2016-07-21 22:18:23 +02:00
Ellpeck
d56ff8ccb0 r52! 2016-07-21 20:40:32 +02:00
Ellpeck
ab0c99cd0b do it regardless + tesla loc 2016-07-21 20:04:10 +02:00
Ellpeck
3603f999da T 2016-07-21 18:52:55 +02:00
Ellpeck
3df2868fe3 Added the ability to change between RF and Tesla display modes in machines 2016-07-21 18:35:38 +02:00
Ellpeck
6cf525f6c5 Cheaper coils and expensiver ender stars 2016-07-21 17:38:46 +02:00
Ellpeck
3390a41a83 Finished the new energy and fluid displays~ 2016-07-21 13:22:55 +02:00
Ellpeck
5dc1951fa1 New energy and fluid displays, part 1! 2016-07-21 01:49:01 +02:00
Ellpeck
ae4af4b804 remove sout 2016-07-20 22:31:42 +02:00
Ellpeck
a0f66373b6 Fixed bowls of water being hideous because they weren't going into the main hand 2016-07-20 22:31:27 +02:00
Ellpeck
4bf0fce0d2 split up util methods for later use 2016-07-20 22:23:03 +02:00
Ellpeck
e9955348d8 Finally made ESD use new capability system. 
Closes #91
 2016-07-20 22:14:30 +02:00
Ellpeck
c31424944d Lens of Disenchanting recipe and doc 2016-07-20 11:16:27 +02:00
Ellpeck
4ef231efb6 Restructured book to have a reconstruction section 2016-07-20 11:03:56 +02:00
Ellpeck
b1d0a72c4f Added lens of disenchanting. 
Closes #161
 2016-07-20 10:42:41 +02:00
Ellpeck
5b924bbd3a Update the way lenses work for what's coming up 2016-07-20 09:49:19 +02:00
Ellpeck
8ea5a3a330 Move this up I guess? 
Closes #160
 2016-07-19 09:15:09 +02:00
Ellpeck
15a0608055 Reverse. 
Fricker.
 2016-07-18 02:09:41 +02:00
Ellpeck
07a9c9b10d Disallow bosses to be spawner changed. 
Thanks to Dan for noticing it.
 2016-07-18 02:08:24 +02:00
Ellpeck
51bca2305f Made JEI know about the drills so that people don't think "wtf how do I craft dis shit" 2016-07-18 00:27:23 +02:00
Ellpeck
fa9ada8f82 Fixed log spam when switching worlds 
Closes #157
 2016-07-17 16:53:09 +02:00
Ellpeck
76ef35da2e Player Probe recipe and doc and Energy Laser Relay recipes 2016-07-17 14:09:57 +02:00
Ellpeck
8b0a5eb799 Override getToolClasses() in tools so that they work with basically every mod that needs it to work. 
Duh.
 2016-07-17 13:34:38 +02:00
Ellpeck
edf870403f Made Drill coloring not lose all of the NBT. 
Closes #153
 2016-07-17 13:27:20 +02:00
Ellpeck
2f9b6aa8f7 booklet now states that drill needs previous tiers 
Closes #155
 2016-07-17 12:59:23 +02:00
Ellpeck
be0270386e Added zh_CN.lang to 1.10.2 branch. 
Holy motherfreaking jesus, how do you do these things, people. Awesome thing.
 2016-07-17 12:48:59 +02:00
Ellpeck
64c152e8da Tiny Torch. 2016-07-14 22:04:24 +02:00
Ellpeck
84c6549c86 Make Player Data UUID dependent again because apparently that works correctly now~ 2016-07-14 20:25:12 +02:00
Ellpeck
a0a23b90c7 yoga 2016-07-14 18:12:09 +02:00
Ellpeck
07a9ae219b energy laser relay variation 2016-07-14 16:44:01 +02:00
Ellpeck
16d74df3cc Fixed player probe being broken 
Thanks for help tiemo42 ^-^
 2016-07-14 13:41:29 +02:00
Ellpeck
bb0d64e869 Made the booklet search bar search a whole item's tooltip 2016-07-14 13:02:09 +02:00
Ellpeck
3d6ecda213 Renamed mashed food to bio mash 2016-07-14 12:53:27 +02:00
Ellpeck
fdfec92f24 Player Probe. 
Don't know if it works yet though.
 2016-07-14 02:11:41 +02:00
Ellpeck
9bafff59d4 Make player data less hideous to use. 
Closes #149
 2016-07-12 22:13:50 +02:00
Ellpeck
32391142ed Rapier 2016-07-12 19:34:02 +02:00
Glenthor
d06b12e163 -Changed BioMass and BioCoal Texures 2016-07-11 18:42:27 +02:00
Ellpeck
5e53360070 Fixed drill, crafter and filter having an unlocalized name in the GUI 2016-07-11 17:28:36 +02:00
Ellpeck
91b398c121 Play the particles on the client when breaking the block directly with a drill 2016-07-11 17:24:26 +02:00
Ellpeck
02a58c5397 Creative tabs are client only. 2016-07-09 17:44:16 +02:00
Ellpeck
a315acc50d Fixed a bug with the game sometimes crashing when looking at a block with the manual in hand 
This should actually fix it.
 2016-07-08 19:08:54 +02:00
Ellpeck
41a78d0399 Why can this even happen..? 2016-07-08 18:45:37 +02:00
Ellpeck
01909c9787 Solid XP drop config 2016-07-08 17:40:47 +02:00
Ellpeck
b4decddd4b TiCon tools lose their broken tag when repairing them in an item repairer 
Closes #142
 2016-07-08 14:29:12 +02:00
Ellpeck
589d94894e InvTweaks pls 
Closes #145
 2016-07-08 13:59:28 +02:00
Ellpeck
bdc6f179cf Fixed the drill sometimes acting up on redstone or glowstone 2016-07-07 20:17:09 +02:00
Ellpeck
346dbf2ccd Cleanup! 2016-07-07 17:59:45 +02:00
Ellpeck
aae29bbfdc Apparently "Coffee Machine" is just a bad englishization from german. 2016-07-07 07:19:44 +02:00
Ellpeck
44f39bf069 What the fuck is wrong with me. 2016-07-07 06:48:09 +02:00
Ellpeck
1e0bf7c65e Fricker. 
Fixed servers.
 2016-07-06 22:04:18 +02:00
Ellpeck
232c23669a Fixed everything. 
Just, everything works now.
Promise.
No, actually, no promise.
 2016-07-06 21:56:15 +02:00
Ellpeck
3cacb98968 Removed booklet stand crafting and doc. 
It's not supposed to be used in survival.
 2016-07-06 21:50:17 +02:00
Ellpeck
f540372c5a Credit where credit is due. 
Relates to #137
Dem feels tho.
 2016-07-06 21:06:37 +02:00
Ellpeck
f8e4a7d29f How did this even get here..? 2016-07-06 20:09:07 +02:00
Ellpeck
b1f1102f94 Phantom Placer side rules 2016-07-06 20:05:56 +02:00
Ellpeck
5cefc43aca Fixed TiCon's mess. 
They also used the wrong method to play the block breaking particles in the first place by the way.
 2016-07-06 18:42:17 +02:00
Ellpeck
5d2ba3734e Made the hideous block breaking code probably even more hideous. 
Anyways, closes #140
 2016-07-06 18:31:29 +02:00
Ellpeck
15c8fcc244 Shock Suppressor texture, recipe and doc 2016-07-05 18:32:22 +02:00
Ellpeck
8b3de70a20 Fixed a crash with phantom redstonefaces >_> 2016-07-05 08:26:11 +02:00
Glenthor
980dc18085 Merge branch 'master' of https://github.com/Ellpeck/ActuallyAdditions 2016-07-04 22:29:22 +02:00
Glenthor
8ce95106b7 -Added ShockAbsorber 2016-07-04 22:29:07 +02:00
Ellpeck
09fbe46c37 [insert swear word here] 2016-07-04 22:18:58 +02:00
Ellpeck
5c114e3880 Made fuel less hideous codewise 2016-07-04 20:23:53 +02:00
Ellpeck
0eb64b2659 Remove some utils that were stupid 2016-07-04 20:15:41 +02:00
Ellpeck
fad1a1b0c9 Shock suppressor, function 2016-07-03 22:53:12 +02:00
Ellpeck
a5e10de4b3 Changed the way tile entity registering and name rendering is handled 2016-07-03 21:57:33 +02:00
Ellpeck
6176404cf1 terrain gen bus 2016-07-03 21:11:46 +02:00
Ellpeck
21f23c3670 Remove NEI integration and fix an event derp 2016-07-03 21:06:44 +02:00
Ellpeck
050f963940 Cleaned up event classes and stuff 2016-07-03 20:57:00 +02:00
Ellpeck
8aa04b7652 Increased the range for sending tile updates because occasionally people that had them in range didn't get updates meaning if they went closer, changes weren't present 2016-07-02 20:31:18 +02:00
Ellpeck
1e82741766 Made display stand only display RF when sneaking 2016-07-02 18:39:47 +02:00
Ellpeck
1e70dd8e49 Make the miner have the drill's harvest level 2016-07-02 17:15:53 +02:00
Ellpeck
794032870a Changed NBT saving system and thus removing some unnecessary interfaces 2016-07-02 15:01:46 +02:00
Ellpeck
8461ffea03 memes 2016-07-01 13:56:15 +02:00
Ellpeck
26a7d74247 Updated forge, fixed some storage crate related stuff 2016-06-27 20:49:26 +02:00
Ellpeck
2c4bb5adca Larger crates recipe and doc 2016-06-27 20:34:58 +02:00
Ellpeck
1c9c7af416 Made this system less stupid 2016-06-27 20:24:45 +02:00
Ellpeck
925b259d8f Added medium and large storage crate 2016-06-27 20:19:04 +02:00
Ellpeck
73ff44851c Biomass and biocoal doc 2016-06-27 19:32:28 +02:00
Ellpeck
ee9c94da74 Added biomass and biocoal made from canola seeds and also made canola seeds edible 
Closes #130
 2016-06-27 19:25:46 +02:00
Ellpeck
28c6e551d8 Made empty buckets be able to get pulled out of the coal generator 
Closes #132
 2016-06-27 18:40:53 +02:00
Ellpeck
1627dace83 Fixed a crash when searching in the booklet 
Closes #133
 2016-06-27 18:36:59 +02:00
Ellpeck
c297df9cc4 Made fluid collector not output and input wrong stuff 2016-06-23 19:27:42 +02:00
Ellpeck
c1eb3fb644 Made fluid collector not output and input wrong stuff 2016-06-19 22:30:18 +02:00
Ellpeck
144e8e4d0a Remove custom fake player in favor of vanilla one, stopped using fake player for worldgen. 2016-06-19 20:24:13 +02:00
Ellpeck
9c16eef80e Made booklet save its bookmarks. 
Were a bit useless without this...
 2016-06-19 19:28:48 +02:00
Ellpeck
e4da62e898 Act like Vaskie 2016-06-18 23:18:19 +02:00
Ellpeck
1575a8aa62 Fixed nullpointer caused by getting capabilities with null facing 2016-06-18 17:30:12 +02:00
Ellpeck
58b959c593 no. 
no again.
 2016-06-18 12:48:19 +02:00
Ellpeck
a90b980d57 Remove additional tesla capabilites as they don't make sense anyways 2016-06-18 12:45:47 +02:00
Ellpeck
7a26ae70df Updated logo and pictures~ 2016-06-18 01:04:25 +02:00
Ellpeck
dec060241c no 2016-06-17 23:54:20 +02:00
Ellpeck
262976074e Massive cleanup 2016-06-17 23:50:39 +02:00
Ellpeck
ace2753c86 Removed crossover entry and changed dots in booklet main page to - as it was causing weird graphical errors in some modpacks 2016-06-17 23:39:55 +02:00
Ellpeck
6a80b6d988 Two new chieves 2016-06-17 23:37:01 +02:00
Ellpeck
9f36b42d30 Made Reconstructor and Display stand not keep their items on the client when removed 2016-06-17 19:14:59 +02:00
Ellpeck
c191761cda Integer -> Long 2016-06-17 15:00:25 +02:00
Ellpeck
cba94da5c5 Removed rarmor integration as the mod is being rewritten soon. 
Sorry. :v
 2016-06-17 14:54:53 +02:00
Ellpeck
b3cac0cadf Documented Tesla 2016-06-17 14:16:01 +02:00
Ellpeck
d8406ab5fc Fixed machines trying to input into themselves with tesla 2016-06-17 14:06:43 +02:00
Ellpeck
138a1af26c Added Tesla support. 
Closes #124
 2016-06-17 14:00:52 +02:00
Ellpeck
eaed253629 Changed the way fluids and RF are handled by always having them both be pulled and pushed. 
Closes #125
 2016-06-17 13:25:15 +02:00
Ellpeck
bfd5311512 Made crafter not randomly create stacks with 0 items in them 
Closes #127
 2016-06-17 13:03:57 +02:00
Ellpeck
f97ba2d31c Fixed Solidifer XP values being off. 
Closes #123
 2016-06-15 18:37:54 +02:00
Ellpeck
718c999f70 Added laser wrench mode switch. 
Closes #119
 2016-06-15 17:42:55 +02:00
Ellpeck
03215e3b5b Fixed crash on singleplayer joining with the new system >_> 2016-06-15 17:15:26 +02:00
Ellpeck
daaad16a32 Completely changed the way packets are handled and removed client data file 2016-06-15 16:43:59 +02:00
Ellpeck
ac6cf7c3bc Added video introduction page 2016-06-12 13:39:26 +02:00
Ellpeck
e9fa9bca92 Fixed a couple of things. 
Hopefully all works now. >_>
 2016-06-11 23:43:28 +02:00
Ellpeck
3dbc31e264 Made coal and oil generator not randomly appear on even though they're not 2016-06-11 16:26:51 +02:00
Ellpeck
3f00973f28 Changed energy handling system to be more like the fluid one and also more sane 2016-06-11 16:14:06 +02:00
Ellpeck
174d2aca7e Made Energy Laser Relay less performance intensive 2016-06-11 16:07:06 +02:00
Ellpeck
b8051e6483 Increased ESD performance by making it remember the tiles around 2016-06-11 15:42:28 +02:00
Ellpeck
91ca5aa4a1 Significantly upped the performance on Item Laser Relays by making them remember the things around them 2016-06-11 15:33:44 +02:00
Ellpeck
26d5d94f39 More proper Laser Relay bounding boxes. 
This only took me about 200 bajillion hours too.
 2016-06-11 13:34:18 +02:00
Ellpeck
e0d290a330 Also made liquifaces and transfer work again 2016-06-10 22:00:30 +02:00
Ellpeck
19d764688f Re-add IFluidHandler since apparently everyone's moaning about EnderIO not getting their shit together 2016-06-10 21:52:37 +02:00
Ellpeck
1b40bd3568 Only add things to smart item laser relay whitelist when they aren't on it yet 2016-06-10 17:53:11 +02:00
Ellpeck
a26db02ebe Changed ESD to allow higher numbers of slots and also have no limit on the max number to input so that you can basically make it pull from infinitely many slots if the amount of slots present is able to change 2016-06-10 13:57:52 +02:00
Ellpeck
4b8d85fd11 Fixed a bug with a non-advanced ESD crashing once trying to put items through it. 
Yes, really.
 2016-06-09 23:43:54 +02:00
Ellpeck
ccb162820b This is going to make Booty Toast sad. 2016-06-09 21:14:43 +02:00
Ellpeck
63de88464b Filter and Display stand recipe and docs 2016-06-09 17:39:01 +02:00
Ellpeck
e944ef6bbf This makes more sense. 2016-06-08 23:04:06 +02:00
Ellpeck
12de298057 Fixed miner sometimes crashing when placed next to certain blocks 
Closes #114
 2016-06-08 23:03:36 +02:00
Ellpeck
75d43d88b4 Added a config option to only display the laser relay particles when holding a laser wrench. 
Closes #113
 2016-06-08 21:09:41 +02:00
Ellpeck
ddaadd25d5 Made damage sources display the player's name 2016-06-08 19:11:06 +02:00
Ellpeck
1547fdaa9e Made player interface display the amount of RF it has 2016-06-08 18:57:57 +02:00
Ellpeck
22e886ded2 Fixed a crash when having phantom liquifaces connected to non-tileentities 
Closes #111
 2016-06-07 23:22:26 +02:00
Ellpeck
470e7b5518 Only clear slots on right side! 2016-06-07 23:18:30 +02:00
Ellpeck
9a9ec02eef Added item filters 2016-06-07 23:17:06 +02:00
Ellpeck
0b025fe249 Re-added invtweaks support for the storage crate 2016-06-06 22:09:23 +02:00
Ellpeck
dc7bd582e6 Remove potion effect so that enough time doesn't cause two people to have the effect 2016-06-06 21:29:21 +02:00
Ellpeck
5895a8de1c Added dispay stand and leaf blower and potion ring integration for it 2016-06-06 21:27:09 +02:00
Ellpeck
5972b516e9 Made esd's whitelist be blacklist by default 2016-06-06 18:05:57 +02:00
Ellpeck
0b106526af Changed white- and blacklists in laser relays and ESDs to be for putting and pulling instead of both for both 2016-06-06 17:59:01 +02:00
Ellpeck
5bd872620c Don't make directories 2016-06-05 17:37:18 +02:00
Ellpeck
d46bb306d8 Fixed a bug with Laser Relays sometimes randomly disconnecting on chunk load. 
*Fuck this game.*
 2016-06-05 16:01:10 +02:00
Ellpeck
9ad6dfcd0f For some reason, with this done, random disconnections don't occur anymore!? 2016-06-05 14:33:53 +02:00
Ellpeck
ff70e6d53d Made equals proper 2016-06-05 12:55:27 +02:00
Ellpeck
e2e2241e63 CLEANUP 2016-06-05 12:52:59 +02:00
Ellpeck
505c88f031 Added equals for Networks and ConnectionPairs 
Just in case that was screwing something up at some point
 2016-06-05 12:51:13 +02:00
Ellpeck
2c24463e0e Made Player Interface recipe more expensive 2016-06-05 12:21:47 +02:00
Ellpeck
707f71d7e3 Fixed configs resetting randomly. 
Closes #107
 2016-06-05 12:15:02 +02:00
Ellpeck
b65f0a7c76 Player Interface recipe and doc 2016-06-05 04:34:01 +02:00
Ellpeck
d66b53af9a Added Player Interface 2016-06-05 04:05:37 +02:00
Ellpeck
f576d58204 Removed a possible memory leak source 2016-06-05 03:02:10 +02:00
Ellpeck
ee01652574 Make all the directories! \o/ 2016-06-05 02:31:37 +02:00
Ellpeck
c5cf9ec90f Update to forge's new fluid system 2016-06-05 02:16:52 +02:00
Ellpeck
193bd806a3 Revert that, as it doesn't change anything 2016-06-05 00:24:10 +02:00
Ellpeck
6fd36259fc Try to save WorldData too when Chunks get unloaded as the stupid data loss bug is still a thing and it doesn't even make any sense 2016-06-05 00:08:32 +02:00
Ellpeck
1aa979195f Made network data not get filled up more than it should by clearing its connections when reading from NBT 2016-06-04 23:43:50 +02:00
Ellpeck
e17a48d7f0 How did I not think of this? 2016-06-04 14:38:20 +02:00
Ellpeck
c154ccbbbf This annoys me. 2016-06-04 14:20:38 +02:00
Ellpeck
b88f2d2c3e This doesn't need to be anymore 2016-06-04 13:52:27 +02:00
Ellpeck
ec07b3da02 Added custom system to save world data because the MC one was always failing on me 2016-06-04 13:51:06 +02:00
Ellpeck
7e682af51d Fixed a syncing bug with tileentities on world join 2016-06-04 00:26:33 +02:00
Ellpeck
3f9ba0aa2f forgot this 2016-06-03 23:46:09 +02:00
Ellpeck
29db45553c Made tools be held like tools. 
Closes #96
 2016-06-03 23:45:02 +02:00
Ellpeck
7892a788be More null checks for less possible crashes 2016-06-03 23:34:01 +02:00
Ellpeck
bec7252405 Changed world data save system in hope that laser relays will disconnect less often 2016-06-03 23:27:37 +02:00
Ellpeck
596d2d0175 Made shovels make path blocks instead of farm land 2016-06-03 22:35:01 +02:00
Ellpeck
7749e9f67d Made compost only accept the current recipe's amount of items 2016-06-03 22:16:23 +02:00
Ellpeck
dbf5a86560 Fixed aiots not having four times the durability of their base tools 
Closes #104
 2016-06-03 21:07:58 +02:00
Ellpeck
eeb7592d22 Fixed block breaking effects playing as just the sound 
Closes #105
 2016-06-03 21:05:49 +02:00
Ellpeck
e46851e789 Water bowl doc and config 2016-06-02 20:07:36 +02:00
Ellpeck
c53ea72404 Added water bowl 2016-06-02 19:28:51 +02:00
Ellpeck
a4c751b47f Removed unfinished-tags in booklet and also made buttons client-side only 2016-06-01 15:22:30 +02:00
Ellpeck
08f141939f Fixed rendering bug with Greenhouse Glass 2016-06-01 15:03:20 +02:00
Ellpeck
707a115708 Cleanup 2016-06-01 00:39:36 +02:00
Ellpeck
2ebe4989b7 Removed ModelResourceLocation on server. 
Closes #103
 2016-06-01 00:37:28 +02:00
Ellpeck
c2c33412bf Where did that even come from..? 2016-05-30 23:57:02 +02:00
Ellpeck
4f69a02698 Update forge and fix addArmorMaterial. 
Closes #101
 2016-05-30 23:55:16 +02:00
Ellpeck
a5ef1fa300 Merge pull request #102 from Ellpeck/1.9 
Update armor on right branch
 2016-05-30 23:50:05 +02:00
sokratis12GR
3f20378f1a Fixed ArmorMaterial 
They change how it works
//new int[]{boots, leggings, chestplate, helmet}
 2016-05-30 22:44:59 +03:00
Ellpeck
4e0082ed7d Remove all uses of @Nonnull because it's stupid anyways. 
ACTUALLY closes #97.
 2016-05-29 23:49:35 +02:00
Ellpeck
79660f3f6f Made hasCapability not call getCapability. 
Supposedly closes #97
 2016-05-29 23:39:50 +02:00
Ellpeck
af67fb87cc Added view online button to booklet 2016-05-29 22:11:18 +02:00
Ellpeck
da0f071d58 Death tracking part 1 2016-05-27 18:54:17 +02:00
Ellpeck
f2ee1b9414 Made booklet words and characters not be more than they should be because everything was being done twice 2016-05-26 23:05:08 +02:00
Ellpeck
9e50818fca Remove formatting codes of the text output 2016-05-26 22:53:11 +02:00
Ellpeck
16d9b95b5a Added a config option to print all of the booklet text to file on startup. 
For debug purposes.
And because it's cool.
 2016-05-26 22:49:47 +02:00
Ellpeck
c6b0ea9f98 Booklet stand model + bounding box 2016-05-26 14:59:48 +02:00
Ellpeck
796944d2ab Re-added booklet stand. 
Model and better bounding box to come.
 2016-05-26 13:11:43 +02:00
Ellpeck
b4a64c1270 Fixed a massive bug with tiles not syncing properly when re-entering unloaded chunks >_> 2016-05-26 13:10:14 +02:00
Ellpeck
d3150672f4 y u no foreach 2016-05-24 18:31:09 +02:00
Ellpeck
b746ec5d03 Lush caves doc 2016-05-21 15:49:50 +02:00
Ellpeck
068f367fa5 Changed world data file name, might break stuff though 2016-05-21 15:34:36 +02:00
Ellpeck
b826c83c50 "Added lush caves that spawn randomly" or something like that. 
I guess I'll leave these in, as they're kind of awesome.
 2016-05-21 12:46:55 +02:00
Ellpeck
9b9f7b8ff3 Scrap this project. 
It doesn't fit the theme, it doesn't work like it should, it's broken to no end.
Yea, I'll probably do it some other time. Maybe.
 2016-05-21 12:21:36 +02:00
Ellpeck
2ff5f2758e Added lush caves to the cave world 2016-05-21 00:39:50 +02:00
Ellpeck
3f0b9beb5c Added custom cave gen for the cave worlds. 
No idea what it actually does right now though.
 2016-05-20 22:13:36 +02:00
Ellpeck
4b425a36ab SUPPRESS ALL THE THINGS!! 2016-05-20 19:05:10 +02:00
Ellpeck
b71af53d13 Reworked compost to accept custom recipes 2016-05-20 17:55:33 +02:00
Ellpeck
93b51eb853 Removed value that was turned to true when having generated the spawn cave as it would've been overriden on world join anyway. As there's only one spawn, unless you set it into chunks that haven't generated yet, it doesn't matter anyways. 2016-05-20 14:50:39 +02:00
Ellpeck
69013d3583 r34! 2016-05-19 20:52:17 +02:00
Ellpeck
b00e214217 1.9.4! 
Go suck a dick now.
 2016-05-19 20:05:13 +02:00
Ellpeck
cddb514382 Turned cave mode off for now. 
Working on it some more at some other point.
 2016-05-19 16:06:27 +02:00
Ellpeck
5cef7badac Removed Firework Box Minecart. 
Aaw :(
 2016-05-19 16:03:37 +02:00
Ellpeck
8b433056d2 Made impure iron convert in water and in the crusher 2016-05-18 21:14:11 +02:00
Ellpeck
05f159f48a Made blocks in the cave world be determined by seed, added impure iron ore that spawns in cave world 2016-05-18 19:34:57 +02:00
Ellpeck
aec4bfbaa4 Change this name 2016-05-17 22:30:05 +02:00
Ellpeck
22b0a9a64e Changed cave world spawning a bit, made the world generate with cobble and glowstone in the walls 2016-05-17 22:26:26 +02:00
Ellpeck
b5e8cf0345 Start of cave world. 
Whaaaat?
 2016-05-17 15:59:12 +02:00
Ellpeck
fd407d3983 Changed client data and fake player to completely lower case 2016-05-17 11:34:50 +02:00
Ellpeck
a2d360d610 How did I not notice this..? 2016-05-16 22:54:44 +02:00
Ellpeck
6c1f8fec6c Update copyright and cleanup code 2016-05-16 22:52:28 +02:00
Ellpeck
a21981bf01 Minecart Rarity 2016-05-16 21:54:22 +02:00
Ellpeck
7aa813f04e Made special drops dependent on the looting level you have 2016-05-16 21:10:35 +02:00
Ellpeck
0454fc521b Made drop chances for wings, solid xp and cobweb more common 
Closes #94
 2016-05-16 17:56:17 +02:00
Ellpeck
e20a82a4ad Firework Box Minecart! 2016-05-16 17:00:29 +02:00
Ellpeck
028accdf3e Added spawner changer to creative tab 2016-05-16 01:04:11 +02:00
Ellpeck
e693486544 Removed calls of addRenderVariant, because apparently it didn't change anything 2016-05-15 12:21:28 +02:00
Ellpeck
96c9e1895c Actually call it 2016-05-15 12:01:26 +02:00
Ellpeck
3403947af0 Moved lenses to API side 
Bump API version to 13
 2016-05-15 12:00:42 +02:00
Ellpeck
09ecb708aa Moved inner tileentity classes to own file 2016-05-14 17:50:10 +02:00
Ellpeck
f34ed513fa r33! 2016-05-14 15:54:57 +02:00
Ellpeck
67147df4cb Put dots in front of the booklet entry buttons on the front page 2016-05-14 15:07:10 +02:00
Ellpeck
5db240b6ad Little tiny change 2016-05-14 14:21:59 +02:00
Ellpeck
64966ad66e Added the possibility for different types of lenses to be conversion lenses 2016-05-14 14:14:06 +02:00
Ellpeck
e0cf180358 Lotsa API restructuring 2016-05-14 13:51:18 +02:00
Ellpeck
1df694c8e9 Added smart whitelist button to the whitelist laser relay that automatically adds items from adjacent chests to the whitelist 2016-05-14 13:13:35 +02:00
Ellpeck
1f2f0e7cbf Remove native invtweaks integration because it was done in a really weird way O_o 2016-05-14 11:15:27 +02:00
Ellpeck
1cdae3be7b Banner shields 2016-05-14 02:26:34 +02:00
Ellpeck
30d493d513 Add custom banner patterns 2016-05-13 23:19:30 +02:00
Ellpeck
796fc2de43 What was this here for..? 2016-05-13 22:08:53 +02:00
Ellpeck
3495901d37 Grab the broom and sweep! 2016-05-13 21:57:53 +02:00
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