987 Commits

Author	SHA1	Message	Date
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	094d4a6ae0	Fixes #2493	2020-10-20 16:45:31 +02:00
TheBusyBiscuit	1998c7746f	Merge pull request #2477 from J3fftw1/fix/#2470 ... fixes #2470	2020-10-18 19:22:04 +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
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
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
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
Panda.com	29541cdfe2	Someone else can go format this if its not good	2020-10-15 15:41:21 +02:00
Panda.com	16bf13b2af	stop bullying	2020-10-15 15:12:03 +02:00
Panda.com	3b43dd7ebc	good now?	2020-10-15 15:08:42 +02:00
Panda.com	ee3e358f31	:pansad:	2020-10-15 15:07:50 +02:00
Panda.com	27583fc3f0	1 eternity later	2020-10-15 15:05:06 +02:00
Panda.com	0b27ea6ed5	?	2020-10-15 15:03:02 +02:00
Panda.com	b70949a386	fixed fingerscrossed	2020-10-15 14:59:44 +02:00
Panda.com	78dcaa4328	fixes #2470	2020-10-15 14:42:44 +02:00
Pierre	36ccb4e5eb	Translate messages_fr.yml via GitLocalize	2020-10-15 11:51:12 +00:00
TheBusyBiscuit	a5ee1cda5a	Translate messages_ja.yml via GitLocalize	2020-10-14 22:42:51 +00:00
Scott Gomez Andoy	c2ade61beb	Translate researches_tl.yml via GitLocalize	2020-10-14 17:18:24 +00:00
Scott Gomez Andoy	20b8dbf09d	Translate messages_tl.yml via GitLocalize	2020-10-14 17:18:23 +00:00
TheBusyBiscuit	b88bad3ef6	Fixes #2452	2020-10-14 14:56:52 +02:00
TheBusyBiscuit	8440143f41	Refactoring	2020-10-14 13:20:12 +02:00
TheBusyBiscuit	50e926d18a	Fixes #2457	2020-10-14 00:34:04 +02:00
TheBusyBiscuit	de1eaca1dc	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git	2020-10-14 00:24:52 +02:00
TheBusyBiscuit	19de4c8476	Fixes #2454 (Added mcMMO support)	2020-10-14 00:24:01 +02:00
TheBusyBiscuit	692fa38246	[CI skip] Merge pull request #2461 from Slimefun/gitlocalize-13398 ... Updated Russian localizations	2020-10-13 23:26:48 +02:00
TheBusyBiscuit	4a53e82414	[CI skip] Merge pull request #2463 from Slimefun/gitlocalize-13432 ... Update Japanese translation file.	2020-10-13 23:25:07 +02:00
LinoxGH	4b39d6d58b	Translate researches_tr.yml via GitLocalize	2020-10-13 13:53:26 +00:00
bito-blosh	97e0c660b2	Translate researches_ja.yml via GitLocalize	2020-10-12 18:40:38 +00:00
TheBusyBiscuit	e2101c4ac9	Translate messages_ru.yml via GitLocalize	2020-10-12 14:26:50 +00:00
SoSeDiK	86d94a3122	Translate researches_ru.yml via GitLocalize	2020-10-12 14:26:49 +00:00
TheBusyBiscuit	87d319cd02	Merge pull request #2382 from LinoxGH/EnergyConnector ... Energy Connectors	2020-10-12 15:49:50 +02:00
TheBusyBiscuit	86b46939d1	[CI skip] Merge pull request #2442 from Slimefun/gitlocalize-13359 ... new translations	2020-10-11 01:36:41 +02:00
Pierre	b7da3d816d	Translate messages_fr.yml via GitLocalize	2020-10-10 23:22:55 +00:00
Pierre	1fb8a2f66c	Translate researches_fr.yml via GitLocalize	2020-10-10 23:22:38 +00:00
LinoxGH	ad505b6cef	Merge branch 'master' into EnergyConnector	2020-10-11 00:26:43 +03:00