3869 Commits

Author	SHA1	Message	Date
TheBusyBiscuit	12e7205280	[Ci skip] Added some unit tests	2020-10-28 12:52:23 +01:00
TheBusyBiscuit	28dda7caea	Merge pull request #2473 from CURVX/fix/armor-forge fixes #2469 ... Fixes ArmorForge	2020-10-28 12:15:34 +01:00
TheBusyBiscuit	6ad3b55e81	Merge pull request #2510 from Mooy1/Fix ... Fixes #2509	2020-10-28 12:14:52 +01:00
TheBusyBiscuit	232ee74ceb	Fixed contributors menu not showing everyone	2020-10-28 01:01:25 +01:00
TheBusyBiscuit	b3befbda49	Some code cleanup, documentation and paper optimizations	2020-10-28 00:44:35 +01:00
Mooy1	d8d98982b2	Update AContainer.java	2020-10-27 09:13:25 -05:00
Mooy1	7c39dbc3af	this gud idk	2020-10-26 09:09:22 -05:00
Mooy1	9f88f24d40	Update src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2020-10-26 08:51:20 -05:00
Mooy1	8608b9223d	Fixes	2020-10-25 22:52:27 -05:00
poma123	99946174de	Translate researches_hu.yml via GitLocalize	2020-10-25 14:40:55 +00:00
András Marczinkó	18f384e9cc	Translate messages_hu.yml via GitLocalize	2020-10-25 14:40:53 +00:00
TheBusyBiscuit	487108df14	Fixes #2505	2020-10-25 14:40:05 +01:00
TheBusyBiscuit	31b912ac70	Oops, forgot to commit that line	2020-10-25 11:55:27 +01:00
TheBusyBiscuit	7f9bed54ff	Added some documentation and two guide item ui ids	2020-10-25 11:54:45 +01:00
Seggan	a7cbea70c2	Added validation	2020-10-24 13:30:32 -04:00
Seggan	9dfc4bdcf4	Removed redundant check	2020-10-24 13:23:44 -04:00
Seggan	7a877cda66	Instruction is now public	2020-10-24 13:08:03 -04:00
Seggan	88096ff7c4	Changed get and set scripts to public (from protected)	2020-10-24 13:00:11 -04:00
TheBusyBiscuit	38bf228012	Merge pull request #2490 from Mooy1/patch-1 ... fix empty slot in contributors	2020-10-20 17:43:09 +02:00
Mooy1	536c5af857	Update ContributorsMenu.java	2020-10-20 10:34:35 -05:00
TheBusyBiscuit	094d4a6ae0	Fixes #2493	2020-10-20 16:45:31 +02:00
Mooy1	4d6d031bca	fix empty slot	2020-10-20 08:56:53 -05:00
CURVX	71ca1458fe	Changes req. by TTB	2020-10-20 00:32:20 +05:30
CURVX	f651f960c0	Made ArmorForge extend BackpackCrafter	2020-10-19 22:56:14 +05:30
TheBusyBiscuit	c7960c292c	Merge pull request #2479 from CURVX/fix/ender-boots fixes #2478 ... Fixes damage taken from Enderpearl with Enderboot on	2020-10-19 12:49:58 +02:00
TheBusyBiscuit	1998c7746f	Merge pull request #2477 from J3fftw1/fix/#2470 ... fixes #2470	2020-10-18 19:22:04 +02:00
CURVX	c98292b08c	Added changes req. by TTB	2020-10-18 22:32:36 +05:30
Panda.com	766a245a16	whoops	2020-10-18 18:42:12 +02:00
Panda.com	48f45bef02	Whoops	2020-10-18 17:39:54 +02:00
Panda.com	0a4f666094	me dumb	2020-10-18 16:06:19 +02:00
Panda.com	b4cd8e0d0c	added Unit Test	2020-10-18 16:01:32 +02:00
Panda.com	e3df3ab012	added tall_flowers.json and requested changes	2020-10-18 15:47:47 +02:00
Panda.com	dc025c7b28	fix	2020-10-18 14:31:54 +02:00
TheBusyBiscuit	734b853eb7	[CI skip] Reduced technical debt	2020-10-18 13:53:15 +02:00
Panda.com	3d364ee331	did requested changes	2020-10-18 13:48:38 +02:00
TheBusyBiscuit	56a1ee5336	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git	2020-10-18 13:17:29 +02:00
TheBusyBiscuit	e054fe6682	Fixes #2448	2020-10-18 13:17:18 +02:00
Nameless	de1e846382	Translate researches_zh-CN.yml via GitLocalize	2020-10-18 02:44:36 +00:00
Nameless	f9d4be9cbb	Translate messages_zh-CN.yml via GitLocalize	2020-10-18 02:44:33 +00:00
Panda.com	e5d341485f	Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into fix/#2470 ... # Conflicts: # src/main/resources/tags/block_placer_ignored_materials.json	2020-10-17 13:37:41 +02:00
TheBusyBiscuit	9f3e2bba7c	[CI skip] Removed a troublesome config setting	2020-10-17 13:22:22 +02:00
TheBusyBiscuit	4aff61f3b1	Removed 1.13 support	2020-10-17 12:54:36 +02:00
TheBusyBiscuit	b976370d97	Reverted deprecation warning	2020-10-17 12:07:21 +02:00
Timotiyadeyhakesem	ca6962811f	Translate categories_he.yml via GitLocalize	2020-10-16 21:57:07 +00:00
Panda.com	49c7d3ad23	14* prs	2020-10-15 15:49:00 +02:00
Panda.com	c00ded786a	fix?	2020-10-15 15:46:01 +02:00
Panda.com	372c6b41b1	a	2020-10-15 15:45:23 +02:00
Panda.com	349c57aef4	a	2020-10-15 15:44:32 +02:00
Panda.com	7dbbb87af5	?	2020-10-15 15:43:28 +02:00
Panda.com	6611eaf444	idk whats wrong with "values"	2020-10-15 15:43:06 +02:00