2366 commits

Author	SHA1	Message	Date
Brennan Ward	978d624eeb	Closes #839 and #840 (#841) ... * Safeguard against #840 * update Common caps * Closes #839	2017-07-08 20:56:24 +02:00
Brennan Ward	9698d345a2	Closes #816 and #819 (#838) ... Align lamps properly with docs Make light updates smoother as well, and use a better access to the needed blockstate.	2017-07-08 11:04:57 +02:00
Brennan Ward	0787f6eb6c	Closes #828 and #829 (#835) ... * update to gradle 4.0 * update forge/maps * Fix table on a stick now mimics vanilla behavior and tries to add stacks back to inv before dropping. * fix a nonsense dupe glitch * fix worm * move a thing so its not on fire and lowercase thingy	2017-07-07 22:09:56 +02:00
Ellpeck	de60180298	good job breaking it, hero	2017-06-29 21:00:34 +02:00
Ellpeck	369f17b0c4	cleanup because whatever Shadows did was wrong	2017-06-29 18:36:33 +02:00
Brennan Ward	d9b6838df9	Fix everything (#825) ... * Fix everything * json	2017-06-29 18:30:02 +02:00
Ellpeck	a40abe88af	this is completely broken but maybe someone will fix it soon	2017-06-29 13:00:11 +02:00
Ellpeck	04380246be	made servers not crash	2017-06-17 00:55:55 +02:00
Ellpeck	fee478d960	I did a thing	2017-06-17 00:48:49 +02:00
Ellpeck	5cb59dbd83	make water bowl not spill when you're standing ... Closes #794	2017-06-16 22:38:09 +02:00
Ellpeck	1bae941349	Remove the after:BuildCraft dependency because it's obsolete ... Closes #796	2017-06-16 22:15:33 +02:00
Ellpeck	e34cef7744	Merge remote-tracking branch 'origin/master'	2017-06-16 22:14:56 +02:00
Ellpeck	22b05a174c	add a config for oil gen values ... Closes #801	2017-06-16 22:14:50 +02:00
TheGamingHuskyMC	b0fe3d1f0e	Fixed issue #802 (#803)	2017-06-09 16:10:38 +02:00
Ellpeck	118800609c	fixed default spawner changer config ... Closes #777	2017-05-28 14:11:59 +02:00
Ellpeck	348086dc62	made the water bowl spill ... Closes #785	2017-05-28 01:49:57 +02:00
Ellpeck	d84a1b7ba2	fix ESD not working with the lower bound being something else than 0 ... Closes #786	2017-05-28 01:26:08 +02:00
Ellpeck	ffef81fdaa	change unimportant feedback to the action bar ... Closes #775	2017-05-28 00:52:10 +02:00
Ellpeck	5ccbc0b9fd	add crafting table on a stick compat for InvTweaks ... Closes #782	2017-05-28 00:48:01 +02:00
Ellpeck	3b8c81638f	change lists for sets to increase contains performance ... Closes #784	2017-05-28 00:37:27 +02:00
Ellpeck	e19c98269f	don't check for insertability for items that don't fit by stack size or type ... Closes #788	2017-05-28 00:17:24 +02:00
Ellpeck	62d074e758	updated forge	2017-05-20 21:05:25 +02:00
Ellpeck	19bcfb21e9	added ender lillies and red orchids to the farmer ... Closes #772	2017-05-20 20:52:56 +02:00
Ellpeck	0c0d9eb068	remove a statement in the manual stating that phantom liquifaces use a redstone signal to auto-output ... Closes #754	2017-05-20 19:57:17 +02:00
Ellpeck	1dcdd196eb	make Phantomfaces output comparator signal ... Closes #759	2017-05-20 19:55:59 +02:00
Ellpeck	807e090f1f	re-worded laser connection info to mean both connected and disconnected ... Closes #761	2017-05-20 19:44:43 +02:00
Ellpeck	31f07a0b5a	fix the chest to crate upgrade doing some stuff again ... Closes #764	2017-05-20 19:41:51 +02:00
Ellpeck	51a76ba85a	fixed item laser display not working if player is too far away from input point ... Closes #765	2017-05-20 19:27:40 +02:00
Ellpeck	284cbd897e	added config for tiny coal and tiny charcoal ... Closes #773	2017-05-20 19:17:44 +02:00
Ellpeck	c38f967d69	ceil phantomface distance so that displays correctly ... Is basically #757 and #758	2017-05-04 14:12:47 +02:00
Ellpeck	aa2decf688	remove tile entity instead of clearing out chest with chest to crate upgrade ... Closes #752	2017-05-03 14:45:22 +02:00
Ellpeck	0e1a4c94be	set harvest level for all tool types	2017-04-05 05:13:50 +02:00
Ellpeck	83d781775a	am I good enough to be an AA tool tho	2017-04-03 19:28:31 +02:00
Ellpeck	13c3df3330	some cleanup	2017-04-01 19:40:39 +02:00
Ellpeck	a082fce0a0	added blaze rod crushing ... Closes #721	2017-03-30 18:14:18 +02:00
Ellpeck	d9695923d8	possibly fixed laser relays sometimes disconnecting (finally? D:)	2017-03-30 18:11:42 +02:00
Ellpeck	f7576c652a	Added the ability to disconnect laser relys ... Closes #698	2017-03-29 12:12:31 +02:00
Ellpeck	ab5a4d29b1	added config for crystal clusters ... Closes #700	2017-03-29 12:05:37 +02:00
Ellpeck	66cc7f59b3	fixed treasure chest having null as their drop item ... Closes #703	2017-03-28 17:18:21 +02:00
Ellpeck	9d2b2b9c47	fix drill, filter and bag being openable in the offhand slot ... Closes #714	2017-03-28 17:16:33 +02:00
Ellpeck	a4f09b5ceb	Merge remote-tracking branch 'origin/master'	2017-03-28 17:09:52 +02:00
Ellpeck	5ea1c653b9	fix the water bowl picking up stuff it shouldn't ... Closes #715	2017-03-28 17:09:45 +02:00
PapiDimmi	66f7b418a5	Minor fixes (#716)	2017-03-28 16:56:23 +02:00
PapiDimmi	fe11e80aab	Fixed error in the manual (#711)	2017-03-26 20:53:09 +02:00
starg09	01ea269c07	fucking hell	2017-03-21 22:27:19 +01:00
BlayTheNinth	f20613a0c6	Add Crafting Tweaks compatibility to Crafting Table on a Stick (#702)	2017-03-19 16:24:58 +01:00
MisterPeModder	e33f9e174d	Small update to french localizations (#693) ... * Updated french localizations * Small update to fr_FR.lang and fr_CA.lang	2017-03-17 14:32:18 +01:00
Ellpeck	ba9a7a5016	Fix a crash issue with the smiley cloud when the world is weird ... Closes #688	2017-03-16 12:05:02 +01:00
Ellpeck	cca76e5020	generate village chests even if dungeon loot is disabled	2017-03-16 12:01:10 +01:00
Ellpeck	d0f8ee1dc7	Tweak generation values a bit	2017-03-16 11:58:47 +01:00
Ellpeck	4d9c2c26b9	Merge remote-tracking branch 'origin/master'	2017-03-16 11:53:39 +01:00
Ellpeck	89a31452f5	Fixed cascading world gen with lush caves and plants ... Closes #690	2017-03-16 11:53:30 +01:00
PapiDimmi	f7fdb8e132	Fixed typos (#691)	2017-03-16 11:16:32 +01:00
xbony2	dbed3dc996	fixing "there is" (#686)	2017-03-12 22:08:37 +01:00
Ellpeck	1de393b5c7	revert caves ~	2017-03-08 20:06:55 +01:00
Ellpeck	18c04a07c0	gonna rethink a couple things for this	2017-03-08 19:01:02 +01:00
Ellpeck	d4598b3ff3	added crystal chisel, intro text to cave mode, tweaks	2017-03-07 20:41:27 +01:00
Ellpeck	ab816a52d4	add basic cave world structure	2017-03-07 17:59:02 +01:00
Ellpeck	911caed6d2	you're a piece of shit Ellpeck	2017-03-07 12:44:30 +01:00
Ellpeck	6c01ffaa87	Added a config to change configuration items ... Closes #668	2017-03-04 22:25:40 +01:00
Ellpeck	d046b44979	remove the manual from dungeon chests	2017-03-04 20:46:30 +01:00
Ellpeck	423089202f	fixed Crusher achievement descriptions being wrong ... Closes #662	2017-03-04 20:44:10 +01:00
Ellpeck	3cd44e60cc	made horse armor yield less when crushing ... Closes #656	2017-03-04 20:39:34 +01:00
MisterPeModder	a4c0e58c7a	Updated french localizations (#658)	2017-02-24 20:04:25 +01:00
Ellpeck	32863f523f	elucent's edition	2017-02-23 23:46:55 +01:00
Ellpeck	0485107c94	added melon and pumpkin farmer behavior and broke the API x)	2017-02-22 13:28:53 +01:00
Ellpeck	cd59523e06	Made furnace and crusher have different textures when smelting again	2017-02-22 12:37:29 +01:00
Ellpeck	498358ddcb	wake me up inside	2017-02-22 11:40:33 +01:00
Ellpeck	3e0f163fac	no ... bad	2017-02-20 13:24:57 +01:00
Ellpeck	f01be2a8ad	Add an atomic reconstructor invoke method to the API	2017-02-20 13:19:19 +01:00
Ellpeck	1487f141bb	Added some more trials	2017-02-19 13:10:43 +01:00
Ellpeck	dbbf876b4b	Fix crystal clusters giving wrong pick block	2017-02-18 18:30:54 +01:00
Ellpeck	4bb8c96a65	who needs servers anyway	2017-02-18 00:58:02 +01:00
Ellpeck	2e228e6380	Added trials	2017-02-18 00:54:58 +01:00
Ellpeck	d4e1fc4353	the other hand is for fapping	2017-02-17 16:24:21 +01:00
MisterPeModder	17016ba8fc	Made even more things localizable and updated french localizations (#643) ... * Updated french localizations to include the new booklet pages * Made even more things localizable * Fixed localizations * Fixed slabs being full cubes	2017-02-16 18:47:14 +01:00
Ellpeck	19843dfcbf	Merge remote-tracking branch 'origin/master'	2017-02-15 06:42:14 +01:00
Ellpeck	e0ed944e33	wake me up inside ... Closes #642	2017-02-15 06:42:08 +01:00
MisterPeModder	9f70748e24	Made more things localizable and updated fr_FR.lang & fr_CA.lang (#638) ... * Updated fr_FR.lang & fr_CA.lang * Made a lot of things localizable * Hardcoded formats and localizations fix * cristal => crystal	2017-02-14 21:50:03 +01:00
Ellpeck	bc91168990	all the crafting and documenting!	2017-02-14 20:48:01 +01:00
Ellpeck	1ef3b268ff	Made Smiley Clouds render special people stuff	2017-02-14 18:40:45 +01:00
Ellpeck	a7f3565404	Change the way goggles work a bit	2017-02-14 18:18:38 +01:00
Ellpeck	d9487f8ef3	added crystal clusters	2017-02-13 23:17:08 +01:00
Ellpeck	910f4aaf9e	remove dead entities	2017-02-13 20:13:24 +01:00
Ellpeck	bdabd081be	Fixed goggles being a little broken	2017-02-13 20:12:47 +01:00
Ellpeck	9b21323c4f	Fix Laser Relay interaction >_<	2017-02-13 19:41:54 +01:00
Ellpeck	e8d89f6df4	Added laser range upgrade	2017-02-13 19:07:53 +01:00
Ellpeck	6d3ef21444	Added infrared goggles	2017-02-13 18:42:33 +01:00
Ellpeck	c4ef6cd863	Add Laser Relay invisbility modfier	2017-02-13 17:36:55 +01:00
Ellpeck	667a740b45	Fix pickup achievements ... Closes #582	2017-02-13 15:34:35 +01:00
Ellpeck	d94010cde8	Make the leaf blower drop blocks on their own ... Closes #624	2017-02-13 15:29:33 +01:00
Ellpeck	d35130e525	Fixed weird player data updating in certain situations ... Closes #630	2017-02-13 15:23:28 +01:00
Ellpeck	2aefe84ff2	Merge remote-tracking branch 'origin/master'	2017-02-13 14:17:03 +01:00
Ellpeck	e2dfaab2a7	Fix an exception due to broken furnace recipes in the booklet ... Closes #631	2017-02-13 14:16:57 +01:00
MisterPeModder	942f501476	fixed a lot of typos in fr_FR.lang (#636)	2017-02-13 07:42:22 +01:00
Ellpeck	e153fc872e	replace charsetlib with charset	2017-02-12 15:53:19 +01:00
Ellpeck	2e5d7e6b49	asie gave me 4chan quotes	2017-02-08 18:45:44 +01:00
Ellpeck	8594854685	asie is a twat	2017-02-07 18:46:37 +01:00
Ellpeck	2b630a7ad6	I thought these were in the same class D:	2017-02-07 18:27:52 +01:00
Ellpeck	e2865afb49	implemented charset carrying for most blocks ... Closes #621	2017-02-07 18:25:45 +01:00
kd8lvt	a33d6941ae	Slightly modified the snail item (#622)	2017-02-06 18:37:48 +01:00
Ellpeck	ca169cd089	added redstone mode to the ranged collector because jose is a whiny bitch	2017-02-06 14:55:54 +01:00
Ellpeck	c98b5cf85f	fix inventory switching sounds when using a placer or the drill	2017-02-06 14:01:11 +01:00
Ellpeck	df81083ca7	whoops	2017-02-06 13:45:58 +01:00
Ellpeck	6ddc276774	fix worms moonwalking	2017-02-06 13:43:38 +01:00
Ellpeck	c3851df8ff	/shrug	2017-02-04 18:34:19 +01:00
Ellpeck	f2c74521b1	Little bit of cleanup ~	2017-02-04 16:48:22 +01:00
Ellpeck	d5c430fcdc	Some changes to common capabilities integration for performance improvements	2017-02-04 16:32:20 +01:00
Ellpeck	4130e0bdf9	Post break event when automatically mining things ... Closes #614	2017-02-04 16:07:58 +01:00
Ellpeck	245f357dfe	duh	2017-02-04 14:18:56 +01:00
Ellpeck	8696c4e758	Merge remote-tracking branch 'origin/master'	2017-02-04 14:12:25 +01:00
Ellpeck	4615a94339	Implemented slotless item handler compat (untested!)	2017-02-04 14:12:17 +01:00
Daniel Mansfield	75d2de8438	Added sugar cane support to the Farmer (#611)	2017-01-31 18:49:42 +01:00
Ellpeck	23299bffc7	Added a tooltip that displays when breaking unbreakable blocks in village houses	2017-01-30 21:13:44 +01:00
Ellpeck	1b27148792	Fix the magnet ring using energy when not picking anything up ... Closes #589	2017-01-30 18:44:29 +01:00
Ellpeck	2d4c7db2aa	Made Bio-mash recipes nicer and also dependent on the saturation ... Closes #593	2017-01-30 18:33:18 +01:00
Ellpeck	0f95f45d3a	Merge remote-tracking branch 'origin/master'	2017-01-30 17:50:21 +01:00
Ellpeck	c29ac3f48b	Fix the Ranged Collector deleting items occasionally ... Closes #607	2017-01-30 17:50:15 +01:00
MisterPeModder44	49a364ee3c	Added fr_CA.lang and fixed typos in en_US and fr_FR (#604)	2017-01-29 00:11:51 +01:00
Ellpeck	e3cd20d171	Make the drill not use energy in creative ... Closes #595	2017-01-28 17:50:34 +01:00
Ellpeck	55e98e5f14	Add a recipe to empty fluid placers/collectors ... Closes #598	2017-01-28 17:47:14 +01:00
Ellpeck	8935a7c3d2	Make the coffee maker store its coffee cache on breaking ... Closes #600	2017-01-28 17:44:30 +01:00
Ellpeck	0c657d2b59	Make the drill digging backet a config option that is off by default ... Closes #584	2017-01-21 15:22:26 +01:00
Ellpeck	3c07f4535d	Stop the storage crate from syncing its NBT ... Closes #586	2017-01-21 13:12:28 +01:00
Ellpeck	8310617bef	r98!	2017-01-18 15:22:04 +01:00
Ellpeck	45f7b8f1d4	Make a change to the network once it is removed so that TileEntities update accordingly	2017-01-18 14:41:21 +01:00
Ellpeck	996b997363	Add a bunch of loadedness checks and add network caching to Laser Relays	2017-01-18 14:26:56 +01:00
Ellpeck	ccb88fd416	Added a config option to change the booklet's font size ... Closes #554	2017-01-14 01:28:20 +01:00
Ellpeck	b972e9433b	Added quartz dust to the oredict as dustNetherQuartz ... Closes #552	2017-01-14 01:10:41 +01:00
Ellpeck	3d6273ac38	Make fluid lasers actively pull fluids ... Closes #564	2017-01-14 00:14:26 +01:00
Ellpeck	9c07287261	Merge remote-tracking branch 'origin/master'	2017-01-13 23:53:55 +01:00
Ellpeck	9b0cb9f45c	yea	2017-01-13 23:53:40 +01:00
xbony2	c6aa2201ef	Spelling fix (#558)	2017-01-08 18:23:57 +01:00
Ellpeck	b8667c1e1e	I'm getting old	2017-01-01 16:23:27 +01:00
Ellpeck	c5c5b2a08c	withered edition (apparently)	2016-12-31 18:10:36 +01:00
Ellpeck	0443a4aaf5	the bat bat	2016-12-31 16:15:56 +01:00
Ellpeck	0582f5aee3	Being consistent is for noobs ... Fixes Player Probe not disconnecting properly	2016-12-30 20:09:05 +01:00
Ellpeck	f58f02f636	make the ESD change on here as well	2016-12-30 12:43:57 +01:00
Ellpeck	2d052750c8	Firework box doc and recipe change	2016-12-29 21:53:34 +01:00
Ellpeck	66309b0488	Made Firework Box a lot more customizable	2016-12-29 21:29:00 +01:00
Ellpeck	a7a802d3c8	Fixed the bag extraction ignoring the first four slots	2016-12-29 19:57:06 +01:00
Ellpeck	851b7a3730	I don't know why this was here	2016-12-29 17:19:31 +01:00
Ellpeck	5d09499f61	Added Battery Box comparator output ... Closes #540	2016-12-28 19:00:26 +01:00
Ellpeck	a10a11badf	Only give 4 relays	2016-12-28 16:41:26 +01:00
Ellpeck	13bf8978cf	Add compatibility with Blood Magic ... Closes #538	2016-12-28 15:57:15 +01:00
Ellpeck	7e6935f646	naughty edition	2016-12-28 15:31:14 +01:00
Ellpeck	723a54d7ba	oitsjustanedition	2016-12-28 15:23:30 +01:00
Ellpeck	3a00e2663c	Fixed a server crash with the packet handler	2016-12-28 15:02:28 +01:00
Ellpeck	881a2006c2	Changed the way world-specific data is stored. Old data will be transferred.	2016-12-28 14:55:03 +01:00
Ellpeck	7ff81ad637	Make Phantomfaces only actually support the capabilities they advertise	2016-12-28 03:12:17 +01:00
Ellpeck	ce1ad10398	Made item particles a little faster	2016-12-27 21:43:00 +01:00
Ellpeck	244456dae4	Fix Item Laser Relay achievement being impossible to get ... Closeos #537	2016-12-27 21:34:30 +01:00
Ellpeck	ed5378a159	Added fancy Laser Relay visuals	2016-12-27 17:40:27 +01:00
Ellpeck	95ee1c0d24	Change some oil gen values	2016-12-27 13:24:08 +01:00
Ellpeck	1b2b033824	Updated to 1.11.2	2016-12-27 12:35:08 +01:00
Ellpeck	74ce4e6d13	fix liquiface	2016-12-27 11:32:40 +01:00
Ellpeck	0c7b7c2c40	Blacklist relays from being used with Phantomfaces ... Closes #531	2016-12-27 11:24:31 +01:00
Ellpeck	ca2468fda6	Add additional checks to the farmers inventory adding method ... Hopefully closes #521	2016-12-27 10:33:13 +01:00
Ellpeck	4f5b58a92b	Made mod mode ignore all other filters by default	2016-12-27 10:31:22 +01:00
Ellpeck	c00f2c812f	bland mode	2016-12-24 17:24:16 +01:00
Ellpeck	c9828562b8	Merge remote-tracking branch 'origin/master'	2016-12-23 21:38:44 +01:00
Ellpeck	424ab1c917	For prospector, with love <3	2016-12-23 21:38:39 +01:00
xbony2	25ec4a0870	Gender neutral language (#523)	2016-12-23 17:46:42 +01:00
xbony2	c33a7e4cad	Fixed creative consumption (#522)	2016-12-23 17:00:18 +01:00
Ellpeck	a6f3581d24	Fix spawner changer not working with some mobs ... Closes #517	2016-12-23 15:33:45 +01:00
Ellpeck	30f10d5b91	Made filter items not be respected as a whitelisted item ... Closes #512	2016-12-23 15:13:57 +01:00
Ellpeck	dc96af3343	r93!	2016-12-22 21:56:08 +01:00
Ellpeck	0df090d53d	actually ignore this	2016-12-22 21:36:50 +01:00
Ellpeck	4724187cf0	Remove the item distributor on here as well	2016-12-22 21:36:35 +01:00
Ellpeck	a5e4be2d3e	r92!	2016-12-18 17:50:31 +01:00
Ellpeck	44c03217fe	Battery box recipe and doc	2016-12-18 17:37:43 +01:00
Ellpeck	a8d1f3653c	Merge remote-tracking branch 'origin/master'	2016-12-18 17:28:34 +01:00
Ellpeck	312484bcfc	Added the coolest block in the mod so far	2016-12-18 17:28:29 +01:00
xbony2	f8283fd645	nitpick theater	2016-12-18 15:24:58 +01:00
Ellpeck	fc1005ee0a	Tone down loot A BIT ... Closes #486	2016-12-18 14:55:04 +01:00
Ellpeck	9efdc5a0fe	fix hopping item interface caching non existant blocks	2016-12-18 14:27:44 +01:00
Ellpeck	49bcda43fa	improve hopping item interface performance	2016-12-18 14:27:10 +01:00
Ellpeck	eda6fcb587	Rewrote item interface doc + hopping item interface crafting / doc	2016-12-18 14:06:42 +01:00
Ellpeck	9f797f022e	Added hopping item interface ... Closes #493	2016-12-18 13:27:14 +01:00
Ellpeck	ad7eb9ac73	Changed Laser Relay recipes to use the Reconstructor ... Closes #494	2016-12-18 12:08:32 +01:00
Ellpeck	3a40edd7a0	Fluid placer/collector comparator output ... Closes #487	2016-12-18 11:58:39 +01:00
Ellpeck	0953c0e906	Made laser relays ignore full containers for input ... Closes #495	2016-12-18 11:53:14 +01:00
Ellpeck	c6b6f1610a	Fix the Disenchanting lens deleting books ... Closes #482	2016-12-18 11:29:23 +01:00
Ellpeck	bea1b4e798	Fix a crash with the chest to crate upgrade ... Closes #499	2016-12-18 11:21:55 +01:00
Ellpeck	81375683d0	Merge remote-tracking branch 'origin/master'	2016-12-17 17:26:48 +01:00
Ellpeck	21cf4a4bac	Add info to the ESD page for Item Interface usage	2016-12-17 17:26:41 +01:00
xbony2	5a9e3eb702	sure	2016-12-17 16:25:32 +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	41a78b0ae2	Fix XP Solidifier texture ... Closes #452	2016-12-05 15:29:35 +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	b51824ecb8	Fix Diamatine Armor not having a texture ... Closes #442	2016-12-04 13:14:43 +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	eeac084481	Changed coal gen text ... Closes #408	2016-11-25 21:35:59 +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	dd95c826de	Stated in the booklet that energy loss stays the same	2016-11-23 22:53:56 +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	ba91bc35c0	Proper engineer textures	2016-11-21 23:23:17 +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	8b96a8b73c	temp engineer texture	2016-11-21 19:10:08 +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	f116c68f9c	r77!	2016-11-20 20:31:38 +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	db9a3a9289	Gave crystallized and empowered oil a name	2016-11-18 22:54:38 +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	36c17b3681	Undo the bad decision part 1	2016-11-17 20:19:24 +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	f6b66f7cff	Fix broken sounds	2016-11-16 22:26:58 +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
Jakob Riepler	1e53014383	Rename all the assets ... because someone thought forcing lowercase would be great	2016-11-16 21:49:51 +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
canitzp	53e3204f3a	New model for the laser relay	2016-11-08 22:06:55 +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	ff1f38d1ac	make clear that the changer is a one time use	2016-11-07 18:02:43 +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
Ellpeck	de46e22840	Fix the item viewer, in very special cases, not updating its inventories	2016-11-03 10:54:28 +01:00