2710 Commits

Author	SHA1	Message	Date
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	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
uiytt	0a18c30890	Removed now useless method : research	2020-10-15 17:38:59 +02: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
TheBusyBiscuit	ceab97361f	[CI skip] Merge pull request #2476 from Slimefun/gitlocalize-13833 ... added new translations	2020-10-15 14:22:47 +02:00
TheBusyBiscuit	954b0075e6	[CI skip] Added package-info.json	2020-10-15 14:15:37 +02:00
Pierre	36ccb4e5eb	Translate messages_fr.yml via GitLocalize	2020-10-15 11:51:12 +00:00
TheBusyBiscuit	e18c7cb245	Fixed a dupe bug with mcMMO	2020-10-15 13:50:12 +02: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
uiytt	19133a05f9	Added guideClickInteraction method ... Added a method in research which manage what to do when a player click on a un-researched item in a guide	2020-10-14 18:28:54 +02:00
CURVX	35fc23c428	Redundant import	2020-10-14 21:40:49 +05:30
CURVX	1437a8d555	Added FakeInv in ArmorForge	2020-10-14 21:34:57 +05:30
uiytt	08b32ce89f	Typo fix	2020-10-14 17:39:16 +02:00
TheBusyBiscuit	b88bad3ef6	Fixes #2452	2020-10-14 14:56:52 +02:00
TheBusyBiscuit	42f849d891	Fixes #2423	2020-10-14 13:31:02 +02:00
TheBusyBiscuit	8440143f41	Refactoring	2020-10-14 13:20:12 +02:00
TheBusyBiscuit	1ffe2fd493	Fixes #2411	2020-10-14 00:51:21 +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	bebb514635	Merge pull request #2467 from CURVX/fix/nether-goo-sheep ... Nether Goo "Tainted Sheep"	2020-10-13 23:27:55 +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
TheBusyBiscuit	91cc7ffc99	[CI skip] Merge pull request #2466 from Slimefun/gitlocalize-13824 ... Updated Turkish Translations	2020-10-13 23:24:01 +02:00
TheBusyBiscuit	5c0b7e2ee2	Fixes #2468	2020-10-13 21:44:24 +02:00
CURVX	5982d9faaa	Missed extra Parenthesis	2020-10-14 00:58:24 +05:30
CURVX	fdc958b6d8	Changes requested by TBB	2020-10-14 00:45:53 +05:30
CURVX	317477cd2c	Tainted Sheep	2020-10-13 20:13:44 +05:30
LinoxGH	4b39d6d58b	Translate researches_tr.yml via GitLocalize	2020-10-13 13:53:26 +00:00
TheBusyBiscuit	5aa300b0be	Merge pull request #2456 from Sfiguz7/master resolves #2369 ... Added Basalt + Blackstone to Crucible	2020-10-13 01:52:43 +02:00
uiytt	916d2bf4ba	Removed empty line	2020-10-12 22:21:33 +02:00
uiytt	cd8603a6d8	Formatting fix	2020-10-12 22:12:37 +02:00
bito-blosh	97e0c660b2	Translate researches_ja.yml via GitLocalize	2020-10-12 18:40:38 +00:00
uiytt	9ded6d1ac4	Added PreCanUnlockResearchEvent ... This event is called when a player click to unlock a research	2020-10-12 19:19:31 +02:00
TheBusyBiscuit	9e3ce9faf1	[CI skip] Formatting	2020-10-12 16:39:06 +02: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
Sfiguz7	2a8c0f7f82	Moved imports.	2020-10-12 16:25:22 +02:00
TheBusyBiscuit	9b1d6367b3	Some lore changes	2020-10-12 16:01:27 +02:00
TheBusyBiscuit	87d319cd02	Merge pull request #2382 from LinoxGH/EnergyConnector ... Energy Connectors	2020-10-12 15:49:50 +02:00
TheBusyBiscuit	2e83b726bc	[CI skip] Removed author tags from high-cohesion classes	2020-10-12 15:49:33 +02:00
TheBusyBiscuit	160c68b378	[CI skip] Refactoring and documentation	2020-10-12 15:04:27 +02:00
Sfiguz7	6cab415e37	Formatting, nerfed Basalt -> Lava	2020-10-12 14:10:16 +02:00
TheBusyBiscuit	612aad5d95	Fixes #2424	2020-10-12 12:11:28 +02:00
TheBusyBiscuit	3b7dd68164	Fixes #2450	2020-10-12 11:52:23 +02:00
TheBusyBiscuit	14e18d2962	Fixes #2455	2020-10-12 11:47:13 +02:00
Sfiguz7	fd58155a18	Added blackstone and basalt -> lava to crucibles	2020-10-12 09:10:52 +02:00
TheBusyBiscuit	f1dea4cab9	Merge pull request #2451 from CURVX/master ... Fix #2433	2020-10-11 18:09:23 +02:00
CURVX	a9e64dbcfc	Resolves #2433	2020-10-11 19:58:17 +05:30
CURVX	064453346d	Resolves #2433	2020-10-11 19:49:34 +05:30
TheBusyBiscuit	c099f0bed4	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git	2020-10-11 15:41:47 +02:00
TheBusyBiscuit	df4a87d9fa	[Ci skip] A little bit of refactoring	2020-10-11 15:41:42 +02:00
LinoxGH	8eeb582ea3	Changed connector recipe.	2020-10-11 15:36:07 +03:00
TheBusyBiscuit	15884c65aa	Merge pull request #2435 from TheSilentPro/master fixes #2420 fixes #2422 ... Stop unwanted actions from StrangeNetherGoo and Heavy Cream	2020-10-11 13:46:40 +02:00
TheBusyBiscuit	b4b18f548f	[CI skip] Reduced technical debt	2020-10-11 12:48:51 +02:00
Silent	7177946aae	Changes pt2	2020-10-11 12:44:15 +02:00
TheBusyBiscuit	b80bc87ddc	Merge pull request #2440 from LinoxGH/ExplosivePickFix Fixed #2439	2020-10-11 12:27:27 +02:00
Silent	2902f74d10	Changes	2020-10-11 12:14:58 +02:00
LinoxGH	4980b078a1	Update BlockListener.java	2020-10-11 08:50:04 +03:00
LinoxGH	7af1e8144d	Update ExplosiveTool.java	2020-10-11 08:48:27 +03:00
TheBusyBiscuit	86b46939d1	[CI skip] Merge pull request #2442 from Slimefun/gitlocalize-13359 ... new translations	2020-10-11 01:36:41 +02:00
TheBusyBiscuit	2c9dcbb5dc	[CI skip] Merge pull request #2441 from Slimefun/gitlocalize-13358 ... new translations	2020-10-11 01:36:28 +02:00
TheBusyBiscuit	bc6ac0a4d1	[CI skip] Added Tape Measure Unit Tests	2020-10-11 01:27:38 +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	957bcd9a3a	Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2020-10-11 02:01:54 +03:00
LinoxGH	d3c0a110a9	Changed capacitor recipe.	2020-10-11 00:31:06 +03:00
LinoxGH	ad505b6cef	Merge branch 'master' into EnergyConnector	2020-10-11 00:26:43 +03:00
LinoxGH	6082abb9b6	Merge branch 'master' into ExplosivePickFix	2020-10-11 00:23:59 +03:00
LinoxGH	bf3e6754cc	Changed event priorities.	2020-10-11 00:19:15 +03:00
LinoxGH	05d7ab5643	Update ExplosiveTool.java	2020-10-11 00:12:42 +03:00
Silent	dfe33b3534	Didn't know this existed	2020-10-10 22:05:50 +02:00
TheBusyBiscuit	bf25fc0b9d	[CI skip] Added Unit Tests for new Item Settings	2020-10-10 21:55:54 +02:00
TheBusyBiscuit	594d322df2	[CI skip] Added EnumSetting	2020-10-10 21:20:25 +02:00
TheBusyBiscuit	a44f2fa626	[CI skip] Some cleanup	2020-10-10 20:46:17 +02:00
Silent	f9928e5e10	Add requested changes	2020-10-10 20:20:08 +02:00
TheBusyBiscuit	fa1cecef2f	[CI skip] Merge pull request #2436 from Slimefun/gitlocalize-13355 ... Updated bulgarian translations	2020-10-10 19:44:00 +02:00
TheBusyBiscuit	6434c79a0a	Translate messages_de.yml via GitLocalize	2020-10-10 17:33:22 +00:00
TheBusyBiscuit	1088aea40e	Translate researches_de.yml via GitLocalize	2020-10-10 17:33:20 +00:00
DNBGlol	01fc7cd536	Translate categories_bg.yml via GitLocalize	2020-10-10 17:28:03 +00:00
DNBGlol	c2ca5a1ea5	Translate resources_bg.yml via GitLocalize	2020-10-10 17:28:02 +00:00
TheBusyBiscuit	2da7efd380	[CI skip] Updated a javadocs tag	2020-10-10 19:18:15 +02:00
TheBusyBiscuit	b60c2382a5	[CI skip] Quickly added DoubleRangeSetting copy	2020-10-10 18:52:22 +02:00
Silent	cf0f7c37e0	Merge remote-tracking branch 'upstream/master'	2020-10-10 18:50:49 +02:00
Silent	0580a873ec	Stop unwanted actions with StrangeNetherGoo and HeavyCream	2020-10-10 18:50:41 +02:00
TheBusyBiscuit	44e6449f9e	Merge pull request #2430 from Slimefun/gitlocalize-13351 ... Update messages_nl.yml	2020-10-10 15:27:19 +02:00
TheBusyBiscuit	c9ca11c62c	[CI skip] Merge pull request #2431 from Slimefun/gitlocalize-13352 ... Update recipes_nl.yml	2020-10-10 15:26:19 +02:00
TheBusyBiscuit	ea1d1756ae	[CI skip] Merge pull request #2432 from Slimefun/gitlocalize-13353 ... Update categories translation for Dutch	2020-10-10 15:25:32 +02:00
TheBusyBiscuit	08bb3291c1	[CI skip] Updated translators list	2020-10-10 15:25:03 +02:00
Senne Van Rompaey	47d39cdc3c	Translate categories_nl.yml via GitLocalize	2020-10-10 13:12:28 +00:00
milvantiou	025021f5b5	Translate categories_nl.yml via GitLocalize	2020-10-10 13:12:27 +00:00
Sven313D	af608e3c13	Translate recipes_nl.yml via GitLocalize	2020-10-10 12:42:09 +00:00
LinoxGH	973f92c979	Update HeadTexture.java ... I guess this is correct now.	2020-10-10 15:33:41 +03:00
Senne Van Rompaey	e80b3b64d2	Translate messages_nl.yml via GitLocalize	2020-10-10 12:27:12 +00:00
TheBusyBiscuit	fd123b0bc2	[CI skip] Added another validation to head textures, looks at Linox	2020-10-10 14:22:14 +02:00
LinoxGH	49eca61a27	Changed HeadTexture.	2020-10-10 15:21:44 +03:00
LinoxGH	729facab61	Added Energy Connector texture.	2020-10-10 15:18:55 +03:00
TheBusyBiscuit	f895adde61	[CI skip] Reduced technical debt	2020-10-10 14:17:05 +02:00
TheBusyBiscuit	4c47a9cb93	Merge pull request #2298 from Slimefun/tags ... Implemented Tags	2020-10-10 13:38:48 +02:00
TheBusyBiscuit	cf6add1149	Some small improvements before the merge	2020-10-10 13:36:07 +02:00
TheBusyBiscuit	c03b54c2c3	[CI skip] Merge pull request #2417 from Slimefun/gitlocalize-13345 ... Updated Hungarian translations	2020-10-10 01:25:10 +02:00
TheBusyBiscuit	72d3d24394	Two annotations!	2020-10-09 17:44:15 +02:00
TheBusyBiscuit	83e8010e29	Lots of refactoring	2020-10-09 17:39:21 +02:00
LinoxGH	26d46c2dc9	Translate researches_tr.yml via GitLocalize	2020-10-09 14:48:14 +00:00
LinoxGH	7e3866a25b	Translate messages_tr.yml via GitLocalize	2020-10-09 14:48:12 +00:00
poma123	72f7441a18	Small fixes	2020-10-09 16:36:25 +02:00
poma123	b7b7fa8a34	Translate researches_hu.yml via GitLocalize	2020-10-09 14:30:47 +00:00
poma123	076f1b51a4	Translate resources_hu.yml via GitLocalize	2020-10-09 14:30:45 +00:00
poma123	5ac0792cb0	Translate recipes_hu.yml via GitLocalize	2020-10-09 14:30:43 +00:00
poma123	f3fafaff26	Translate categories_hu.yml via GitLocalize	2020-10-09 14:30:42 +00:00
poma123	bd0f15bc95	Translate messages_hu.yml via GitLocalize	2020-10-09 14:30:38 +00:00
bito-blosh	3e20911c48	Translate researches_ja.yml via GitLocalize	2020-10-09 12:13:19 +00:00
TheBusyBiscuit	c440fd0778	Translate messages_ja.yml via GitLocalize	2020-10-09 12:13:17 +00:00
TheBusyBiscuit	aab665ffea	Merge branch 'master' into tags	2020-10-09 11:46:47 +02:00
LinoxGH	b2833dc5c0	Update MagicalZombiePills.java	2020-10-08 21:42:57 +03:00
TheBusyBiscuit	8c80ad4040	Cleanup	2020-10-08 19:05:23 +02:00
TheBusyBiscuit	d891d182b5	Intentionally messed up imports	2020-10-08 18:53:19 +02:00
TheBusyBiscuit	2d00f3e704	Merge branch 'master' into tags	2020-10-08 16:16:11 +02:00
LinoxGH	09a40d036e	Update src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/EnergyNetComponent.java ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2020-10-08 16:04:01 +03:00
LinoxGH	40caa2d574	Update ResearchSetup.java	2020-10-08 16:02:53 +03:00