4639 Commits

Author	SHA1	Message	Date
TheBusyBiscuit	318c154e78	Fixed locale path	2021-01-06 17:56:03 +01:00
TheBusyBiscuit	b6f257bff1	Fixed whitespaces in yaml	2021-01-06 17:54:58 +01:00
TheBusyBiscuit	4f21d06c69	Added verbose flag to /sf timings	2021-01-06 17:52:46 +01:00
TheBusyBiscuit	75b72eb630	Removed deprecated stuff	2021-01-06 16:26:40 +01:00
TheBusyBiscuit	74f8204b75	[Ci skip] Refactoring	2021-01-06 14:23:49 +01:00
TheBusyBiscuit	a1ce83b58a	[CI skip] Removed redundant modifiers	2021-01-06 12:24:56 +01:00
ProfElements	4eda0923bf	Make all ItemSettings reasonable values	2021-01-04 14:14:30 -06:00
ProfElements	685614803c	Add ItemSettings, hasCustomMaxLevel, customMaxLevel. Bypasses vanilla but not a custom defined max	2021-01-03 13:53:43 -06:00
TheBusyBiscuit	308367c5e1	Properly register categories	2021-01-03 20:48:46 +01:00
TheBusyBiscuit	ca86f1c641	Finished Multi Categories maybe?	2021-01-03 20:26:58 +01:00
TheBusyBiscuit	00902c8738	Merge pull request #2666 from Slimefun/chore/craftbukkit-warning ... Enforce Server Software requirements	2021-01-03 19:50:51 +01:00
ProfElements	62f0019a7f	Lower time requirement to deal with large enchantments books (>4 enchantments)	2021-01-03 12:36:08 -06:00
ProfElements	fe8b0c21f7	Fixed code inconsistencies	2021-01-03 12:35:00 -06:00
TheBusyBiscuit	debf201846	Started to refactor holograms	2021-01-03 18:48:18 +01:00
ProfElements	c162e5194d	Merge branch 'master' into master	2021-01-03 05:10:28 +00:00
ProfElements	a42af430e3	Add deniesVanillaRules ItemSetting, this can make the Book Binder adhere to vanilla rules	2021-01-02 22:50:48 -06:00
ProfElements	b23869f037	Added Book Binder	2021-01-02 22:26:59 -06:00
TheBusyBiscuit	ef0d557b62	[CI skip] Merge pull request #2678 from Slimefun/gitlocalize-14569 ... Updated bulgarian translations	2021-01-02 20:43:50 +01:00
TheBusyBiscuit	c637b2fd0c	[CI skip] Updated translators list	2021-01-02 20:43:29 +01:00
Nikolay	3acdcec70f	Translate categories_bg.yml via GitLocalize	2021-01-02 19:42:31 +00:00
Nikolay	e89363e8bb	Translate recipes_bg.yml via GitLocalize	2021-01-02 19:42:30 +00:00
TheBusyBiscuit	60acccfb28	[CI skip] Merge pull request #2671 from Slimefun/gitlocalize-14557 ... update translation	2021-01-02 20:37:25 +01:00
TheBusyBiscuit	1d95455429	[CI skip] Merge pull request #2672 from Slimefun/gitlocalize-14558 ... update translation	2021-01-02 20:37:09 +01:00
TheBusyBiscuit	df2dce0c95	[CI skip] Updated translators list	2021-01-02 20:35:54 +01:00
Aeris One	863306d2df	Translate messages_fr.yml via GitLocalize	2021-01-01 16:07:21 +00:00
Pierre	270382d7ec	Translate messages_fr.yml via GitLocalize	2021-01-01 16:07:19 +00:00
Aeris One	b23972c7dd	Translate researches_fr.yml via GitLocalize	2021-01-01 16:06:53 +00:00
TheRetix	b41a4df823	Translate researches_fr.yml via GitLocalize	2021-01-01 16:06:52 +00:00
TheBusyBiscuit	db789f1b0d	A little bit of additional refactoring	2021-01-01 00:45:05 +01:00
TheBusyBiscuit	f2dd3a0125	Fixes #2655	2020-12-31 17:38:51 +01:00
TheBusyBiscuit	aa98bd0ba2	Fixes #2664	2020-12-31 17:08:50 +01:00
TheBusyBiscuit	bd9d496b4d	Enforce Server Software requirements	2020-12-31 16:33:43 +01:00
TheBusyBiscuit	77c5630797	First implementation of a MultiCategory	2020-12-27 16:19:37 +01:00
svr333	c53837a0de	Remove redundant whiteline	2020-12-24 17:43:11 +01:00
TheBusyBiscuit	9725d63cf0	Update src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/utils/TestInfiniteBlockGenerators.java	2020-12-24 16:17:33 +01:00
TheBusyBiscuit	e88682c13b	Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/InfiniteBlockGenerator.java	2020-12-24 16:17:20 +01:00
TheBusyBiscuit	2199fb2cd0	Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockPhysicsListener.java	2020-12-24 16:15:47 +01:00
svr333	32b9788e74	Merge branch 'master' into chore/has-unlocked	2020-12-24 12:40:08 +01:00
Daniel Walsh	9c31c746dd	Requested changes	2020-12-23 22:16:45 +00:00
Daniel Walsh	6cf2051e60	Panda smells	2020-12-23 14:56:51 +00:00
Daniel Walsh	00c233dee5	Move to a method	2020-12-23 14:32:47 +00:00
Daniel Walsh	2872cf8a2e	Fixed #2647	2020-12-23 14:17:35 +00:00
svr333	9c32089eeb	Update class description	2020-12-22 22:59:30 +01:00
svr333	3c3836a3f5	Merge branch master from upstream	2020-12-22 22:45:33 +01:00
svr333	f0da074b98	Add missing return statement ... If we dont add that return statement it can send 2 messages at once	2020-12-22 22:26:04 +01:00
svr333	ac09d96b40	Merge branch 'master' into fix/sf-machine-hopper	2020-12-22 22:02:20 +01:00
TheBusyBiscuit	bd06d0daec	Wrong import	2020-12-22 15:58:18 +01:00
TheBusyBiscuit	2cd0378306	Thank god we have Unit Tests :monkaS:	2020-12-22 15:53:00 +01:00
TheBusyBiscuit	b00afa4790	Refactoring	2020-12-22 15:47:58 +01:00
TheBusyBiscuit	65fc3cea4e	Finalized the fix for #2636	2020-12-21 12:27:16 +01:00
Daniel Walsh	2c4c7579ae	Merge pull request #2637 from AnotherMC/master ... Temporary fix for #2636	2020-12-20 22:20:03 +00:00
Patbox	d7a8903211	Temponary fix for #2636	2020-12-19 16:30:38 +01:00
Nameless	6be86e99be	Translate researches_zh-CN.yml via GitLocalize	2020-12-19 14:28:02 +00:00
Nameless	7659ae892f	Translate messages_zh-CN.yml via GitLocalize	2020-12-19 14:27:59 +00:00
svr333	5aa34c7a6e	Update recipe	2020-12-17 21:05:12 +01:00
TheBusyBiscuit	2ff24c2889	Fixed compilation	2020-12-17 19:45:43 +01:00
TheBusyBiscuit	26a64004d2	Merge branch 'master' into fixes/blocks	2020-12-17 19:42:56 +01:00
TheBusyBiscuit	f755e943c4	[CI skip] Refactoring and code cleanup	2020-12-17 18:30:51 +01:00
TheBusyBiscuit	8c8685b6de	Merge branch 'master' into fixes/blocks	2020-12-17 15:35:57 +01:00
TheBusyBiscuit	2ced45b485	Merge pull request #2609 from Slimefun/refactoring/third-party-integrations ... Refactored integrations (+ Fixed #2575)	2020-12-17 15:30:16 +01:00
TheBusyBiscuit	d70e79ccfa	[CI skip] Merge pull request #2623 from Slimefun/gitlocalize-14291 ... messges_es	2020-12-17 13:36:21 +01:00
TheBusyBiscuit	41dfc92358	[CI skip] Merge pull request #2624 from Slimefun/gitlocalize-14292 ... researches_es	2020-12-17 13:33:55 +01:00
TheBusyBiscuit	e6114f7e4b	[CI skip] Updated translators list	2020-12-17 13:33:23 +01:00
TheBusyBiscuit	dbaca5f7aa	Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/HologramProjector.java ... Co-authored-by: Daniel Walsh <walshydev@gmail.com>	2020-12-16 15:53:50 +01:00
DaHolyCheese	b99f04eab4	Translate researches_es.yml via GitLocalize	2020-12-12 14:51:08 +00:00
Luu7	67112e29ac	Translate messages_es.yml via GitLocalize	2020-12-12 14:50:26 +00:00
TheBusyBiscuit	86e677cd93	Translate messages_de.yml via GitLocalize	2020-12-12 13:23:55 +00:00
TheBusyBiscuit	e56ba77002	Translate researches_de.yml via GitLocalize	2020-12-12 13:23:54 +00:00
TheBusyBiscuit	a95652f718	[CI skip] Merge pull request #2620 from Slimefun/gitlocalize-14285 ... add zh-TW version of bee armor research	2020-12-12 14:05:04 +01:00
TheBusyBiscuit	f32be5649a	[CI skip] Merge pull request #2619 from Slimefun/gitlocalize-14284 ... add zh-TW version of bee armor message	2020-12-12 14:04:29 +01:00
TheBusyBiscuit	f84faab48d	[CI skip] Merge pull request #2615 from Slimefun/gitlocalize-14281 ... Updated Russian localizations	2020-12-12 14:03:49 +01:00
TheBusyBiscuit	88b6e6d9af	[CI skip] Merge pull request #2617 from Slimefun/gitlocalize-14283 ... Updated Hungarian translations	2020-12-12 14:02:53 +01:00
TheBusyBiscuit	d2e1ac9b6e	[CI skip] Merge pull request #2621 from Slimefun/gitlocalize-14287 ... Update Japanese translation file.	2020-12-12 14:02:06 +01:00
TheBusyBiscuit	3d54080001	[CI skip] A bit o refactoring	2020-12-12 14:00:11 +01:00
bito-blosh	3825fa5d4b	Translate researches_ja.yml via GitLocalize	2020-12-11 20:09:09 +00:00
TheBusyBiscuit	def67399c4	Translate messages_ja.yml via GitLocalize	2020-12-11 20:09:06 +00:00
HeroBrineKing	4e510aefc8	Translate researches_zh-TW.yml via GitLocalize	2020-12-11 13:07:36 +00:00
TheBusyBiscuit	4fd973b3b1	Translate messages_zh-TW.yml via GitLocalize	2020-12-11 13:07:09 +00:00
poma123	b43277c0f4	Translate researches_hu.yml via GitLocalize	2020-12-11 12:36:35 +00:00
TheBusyBiscuit	f36743cfe3	Translate messages_hu.yml via GitLocalize	2020-12-11 12:36:33 +00:00
SoSeDiK	fc97648abb	Translate researches_ru.yml via GitLocalize	2020-12-11 12:11:41 +00:00
SoSeDiK	8d7e15df81	Translate messages_ru.yml via GitLocalize	2020-12-11 12:11:38 +00:00
TheBusyBiscuit	498da0e00a	[CI skip] Merge pull request #2598 from Slimefun/feature/bee-armor ... Added Bee Armor	2020-12-11 13:05:20 +01:00
TheBusyBiscuit	3c72abad7b	Merge branch 'master' into fixes/blocks	2020-12-10 22:05:25 +01:00
Senne Van Rompaey	3acd6926ad	Merge branch 'master' into refactoring/third-party-integrations	2020-12-10 22:02:21 +01:00
TheBusyBiscuit	5aa5ca1aed	Merge pull request #2595 from AnotherMC/master ... Fix ghost blocks	2020-12-10 21:51:00 +01:00
Patbox	28e5771ca8	Implement more suggestions	2020-12-10 12:38:31 +01:00
TheBusyBiscuit	eac09eea9e	Switched to BlockFormEvent	2020-12-10 12:11:25 +01:00
TheBusyBiscuit	b07a54d515	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into performance/cobblestone	2020-12-10 12:04:48 +01:00
TheBusyBiscuit	7b0f9c1300	Fixed naming	2020-12-10 00:22:14 +01:00
TheBusyBiscuit	0c1485aa7c	Merge branch 'master' into fix/sf-machine-hopper	2020-12-09 18:42:42 +01:00
TheBusyBiscuit	36be4c29de	More refactoring	2020-12-09 13:33:34 +01:00
TheBusyBiscuit	7d9e726102	More refactoring	2020-12-09 12:39:24 +01:00
TheBusyBiscuit	88c81a9cc2	Added ItemsAdder support (fixes #2575)	2020-12-09 11:41:59 +01:00
TheBusyBiscuit	2e13cd2e88	Refactoring for third-party integrations	2020-12-08 21:07:48 +01:00
Just Mango	555aa050a1	Translate categories_vi.yml via GitLocalize	2020-12-07 11:16:58 +00:00
svr333	d571fc5c18	Change speed to 45 instead of 90	2020-12-06 13:19:02 +01:00
svr333	434d469a0d	Add t3 Electric Ore Grinder	2020-12-06 02:01:39 +01:00
TheBusyBiscuit	56316426aa	Updated to latest Slimefun version	2020-12-05 21:50:46 +01:00
TheBusyBiscuit	bd213a7789	No idea what that was doing here...	2020-12-05 21:45:42 +01:00
TheBusyBiscuit	9504e523f4	Merge branch 'master' into feature/bee-armor	2020-12-05 21:43:40 +01:00
TheBusyBiscuit	080bc42130	Updated more implementations	2020-12-05 21:35:43 +01:00
Patbox	7afb9b9791	Implement more suggestions	2020-12-05 20:51:30 +01:00
Patbox	ff634c0f5c	Make code better	2020-12-05 20:22:03 +01:00
Patbox	f4633c528f	Fix ghost blocks	2020-12-05 17:48:17 +01:00
TheBusyBiscuit	175a79ebdc	Registered missing Listener	2020-12-05 14:36:04 +01:00
TheBusyBiscuit	036c156f40	Some more changes	2020-12-05 14:21:14 +01:00
TheBusyBiscuit	c84200d2c4	Some stuff + fixes #2560	2020-12-05 13:54:46 +01:00
TheBusyBiscuit	282367d6ff	[CI skip] Removed an old version of bStats	2020-12-03 15:51:17 +01:00
TheBusyBiscuit	96c4d9081c	Merge pull request #2503 from Slimefun/optimization/cargo-filters ... Cargo Net Optimization: Cached Item Filters	2020-12-03 15:41:35 +01:00
TheBusyBiscuit	e717b77ddc	[CI skip] Might as well push this today	2020-12-03 15:28:58 +01:00
TheBusyBiscuit	5d15a7e5cf	Another small change	2020-12-03 10:38:03 +01:00
TheBusyBiscuit	e1a3bf730b	Made requested changes	2020-12-03 10:34:05 +01:00
TheBusyBiscuit	90df68b0e0	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into optimization/cargo-filters	2020-12-03 10:23:18 +01:00
TheBusyBiscuit	96e38608f9	Added 4 bricks -> 1 brick block recipe to the Electric Press	2020-12-01 16:37:51 +01:00
TheBusyBiscuit	5d0ed3570d	Fixes #2583	2020-12-01 16:12:57 +01:00
TheBusyBiscuit	ac7bb44d98	Fixes #2585	2020-12-01 11:46:59 +01:00
TheBusyBiscuit	b4edc6c5bf	Fixes #2496	2020-11-30 17:39:31 +01:00
TheBusyBiscuit	1d4cb85cb1	Fixes #2576	2020-11-30 17:03:17 +01:00
TheBusyBiscuit	c4619ecbaa	Fixes #2574	2020-11-30 15:13:53 +01:00
Nameless	3a5bfd75cb	Translate researches_zh-CN.yml via GitLocalize	2020-11-28 10:37:27 +00:00
TheBusyBiscuit	77f4373bcc	Added a few more unit tests	2020-11-26 18:44:39 +01:00
TheBusyBiscuit	3e645a148f	Refactoring	2020-11-26 18:21:10 +01:00
TheBusyBiscuit	d0e7e21877	Performance and memory improvements	2020-11-25 14:27:46 +01:00
TheBusyBiscuit	925cb9d0d1	[Ci skip] A small code improvement	2020-11-23 18:37:20 +01:00
TheBusyBiscuit	354dd30e52	Removed EmeraldEnchants integration	2020-11-23 16:58:08 +01:00
TheBusyBiscuit	876fbda585	[CI skip] Merge pull request #2564 from Slimefun/gitlocalize-14181 ... Update pt-BR translations	2020-11-23 16:35:47 +01:00
TheBusyBiscuit	1ec4e67df4	[CI skip] Merge pull request #2565 from Slimefun/gitlocalize-14182 ... Updated pt translations	2020-11-23 16:35:21 +01:00
TheBusyBiscuit	4a6418cd7d	[CI skip] Updated translators list	2020-11-23 16:34:47 +01:00
Gustavo de Souza	bf06e2be83	Translate categories_pt.yml via GitLocalize	2020-11-23 12:36:03 +00:00
Mauricio Roberto	ac1788a98c	Translate researches_pt-BR.yml via GitLocalize	2020-11-23 12:35:09 +00:00
TheBusyBiscuit	497359568e	[Ci skip] Refactoring and documentation	2020-11-22 14:06:06 +01:00
CURVX	ef09b03af4	Blank line	2020-11-21 22:51:14 +05:30
CURVX	5e0e9d5490	Merge branch 'master' into fix/sf-machine-hopper	2020-11-21 22:21:34 +05:30
CURVX	7f385cdc8d	Formatting changes	2020-11-21 22:17:55 +05:30
TheBusyBiscuit	f689c2fc4f	Added an item setting to the Infused Hopper to toggle it with redstone	2020-11-21 15:34:09 +01:00
TheBusyBiscuit	3bd595a930	Fixes #2421	2020-11-21 14:18:54 +01:00
TheBusyBiscuit	55188bfd0a	Fixes #2518 (+ refactoring and documentation)	2020-11-21 14:06:38 +01:00
TheBusyBiscuit	5bf3e38bae	Fixed Armor Stands getting damaged/pushed by Explosive Bow	2020-11-20 13:39:25 +01:00
TheBusyBiscuit	1f32b160a5	Update src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/AbstractItemNetwork.java ... Co-authored-by: Senne Van Rompaey <vanrompaey.senne@protonmail.com>	2020-11-20 03:00:23 +01:00
TheBusyBiscuit	c5f6b53412	Updated unit tests for new elapsed time method	2020-11-20 00:34:29 +01:00
TheBusyBiscuit	d8563eb5dc	Fixed some docs	2020-11-19 22:22:42 +01:00
TheBusyBiscuit	f2a6d97f29	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git	2020-11-19 22:21:01 +01:00
TheBusyBiscuit	15f281504f	More performance and memory improvements	2020-11-19 22:20:43 +01:00
TheBusyBiscuit	bb764b7584	Fixed Guide Settings showing "last activity" as a negative number	2020-11-19 21:00:28 +01:00
TheBusyBiscuit	eea3254d11	Merge pull request #2555 from wzpzw5/patch-10 ... Fixed a bug of Duplicate items with BlockPlacer	2020-11-19 18:08:02 +01:00
TheBusyBiscuit	8f3cad0419	[CI skip] Fixed two color codes related to the Elevator Plate	2020-11-19 18:06:17 +01:00
TheBusyBiscuit	8fab8268d4	[CI skip] Small change	2020-11-19 17:47:50 +01:00
TheBusyBiscuit	7e657c9810	A ton of performance improvements	2020-11-19 17:42:10 +01:00
TheBusyBiscuit	94752a9027	Fixes #2558	2020-11-19 15:01:47 +01:00
TheBusyBiscuit	c8d60ddc7b	Merge pull request #2494 from CURVX/fix/hopper-on-brew fixes #2447 ... Fixes brewing potion from Slimefun dusts using hopper	2020-11-19 14:46:39 +01:00
TheBusyBiscuit	86715cd3d0	Fixed CoreProtect not recognizing Slimefun blocks getting broken	2020-11-19 13:11:30 +01:00
TheBusyBiscuit	64fd5a54c3	Added an item setting to configure the Wind Staff velocity	2020-11-19 12:49:42 +01:00
TheBusyBiscuit	a18317295a	[CI skip] Refactoring	2020-11-19 12:45:35 +01:00
wzpzw5	024dbf4fc5	Update BlockPlacer.java	2020-11-18 01:37:54 +00:00
wzpzw5	d76f77cd84	Update BlockPlacer.java	2020-11-18 01:21:59 +00:00
wzpzw5	965e348695	Update BlockPlacer.java	2020-11-17 01:13:03 +00:00
wzpzw5	3db77a0081	Fixed a bug of Duplicate items with BlockPlacer ... Fixed a bug of Duplicate items with BlockPlacer's delay on BlockPlacer place an item, just take out the item when it place,then one in hand and another is placed	2020-11-17 00:01:04 +00:00
TheBusyBiscuit	0cdd21f6bb	Added a config option to delete excess cargo network items	2020-11-15 16:29:45 +01:00
Moritz Kempe	6cddd2b817	Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into master	2020-11-15 08:58:34 +01:00
TheBusyBiscuit	0b9ab8b6cc	Fixes #2446	2020-11-14 18:44:07 +01:00
TheBusyBiscuit	503dbc8367	Fixes #2418	2020-11-14 18:32:53 +01:00
CURVX	527dfb2b79	Been a while	2020-11-12 22:20:36 +05:30
CURVX	c4a08fe991	Changes req by TTB	2020-11-12 18:32:18 +05:30
TheBusyBiscuit	f1d4b50b67	One more tweak	2020-11-10 01:09:50 +01:00
TheBusyBiscuit	97cbe72a91	Some tweaks to the experimental bee wings	2020-11-10 01:04:15 +01:00
TheBusyBiscuit	e5b2924bee	Finished Bee Wings	2020-11-10 00:56:06 +01:00
TheBusyBiscuit	f3cf421f0e	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into bee-armor	2020-11-10 00:40:59 +01:00
TheBusyBiscuit	05e983917a	Added CoolerFeedPlayerEvent	2020-11-10 00:36:38 +01:00
TheBusyBiscuit	1d36ca82ba	Merge pull request #2522 from Slimefun/code-quality/abstract-classes ... Code quality: Getting rid of abstract energy classes	2020-11-10 00:11:50 +01:00
TheBusyBiscuit	dee7ded9cd	Merge pull request #2537 from Slimefun/gitlocalize-14021 ... fix of messenge_zh-TW	2020-11-08 23:40:14 +01:00
TheBusyBiscuit	a5704aee3f	Merge pull request #2388 from svr333/MoreTalismans ... More talismans	2020-11-08 23:35:40 +01:00
TheBusyBiscuit	4d00ffc9af	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into code-quality/abstract-classes	2020-11-05 00:08:04 +01:00
TheBusyBiscuit	933bd9d9b9	Merge branch 'code-quality/abstract-classes' of https://github.com/Slimefun/Slimefun4.git into code-quality/abstract-classes	2020-11-05 00:07:50 +01:00
TheBusyBiscuit	f8306f0693	Small addition	2020-11-05 00:07:37 +01:00
TheBusyBiscuit	3170f143a2	Added a config option to disable network visualizations	2020-11-04 11:18:06 +01:00
Wei-Liang Liou	b9f1e6d688	Translate messages_zh-TW.yml via GitLocalize	2020-11-04 10:08:41 +00:00
TheBusyBiscuit	b80d8cfeda	[CI skip] Updated translators	2020-11-03 18:28:08 +01:00
Wei-Liang Liou	b076d9ee64	Translate categories_zh-TW.yml via GitLocalize	2020-11-03 15:33:31 +00:00
TheBusyBiscuit	e7f7a4d392	Merge pull request #2462 from uiytt/canUnlockResearchEvent ... Added PlayerPreResearchEvent	2020-11-03 09:41:42 +01:00
uiytt	54ebfbb18c	Last formatting fix	2020-11-02 20:06:03 +01:00
TheBusyBiscuit	d69cf78331	Merge branch 'master' into MoreTalismans	2020-11-02 15:12:56 +01:00
TheBusyBiscuit	1c5f2f650b	Some refactoring and small fixes	2020-11-02 15:10:56 +01:00
TheBusyBiscuit	be001baa6e	[CI skip] Merge pull request #2508 from Sfiguz7/master ... Smallest documentation fix ever	2020-11-02 12:38:37 +01:00
Sfiguz7	22fd9e549f	Removed link from brewing stand	2020-11-02 01:04:53 +01:00
TheBusyBiscuit	25c3368ad3	Merge branch 'master' into code-quality/abstract-classes	2020-11-01 21:06:35 +01:00
TheBusyBiscuit	8536965962	Fixes #2517	2020-11-01 20:59:34 +01:00
TheBusyBiscuit	1141a01fd0	Fixes #2519	2020-11-01 20:46:29 +01:00
TheBusyBiscuit	6ced4d166e	Fixes #2527	2020-11-01 20:12:34 +01:00
HeroBrineKing	519140ede6	Translate resources_zh-TW.yml via GitLocalize	2020-10-31 11:50:41 +00:00
HeroBrineKing	36460ed11f	Translate researches_zh-TW.yml via GitLocalize	2020-10-31 11:50:40 +00:00
HeroBrineKing	7ecdbbc97d	Translate recipes_zh-TW.yml via GitLocalize	2020-10-31 11:50:39 +00:00
TheBusyBiscuit	935a36cfbd	Translate messages_zh-TW.yml via GitLocalize	2020-10-31 11:50:36 +00:00
HeroBrineKing	5fafac0f84	Translate categories_zh-TW.yml via GitLocalize	2020-10-31 11:50:35 +00:00
TheBusyBiscuit	3bf7dfc1c3	Update recipes_ko.yml	2020-10-31 10:17:59 +01:00
20181241	aa29c33625	Translate recipes_ko.yml via GitLocalize	2020-10-31 09:15:24 +00:00
TheBusyBiscuit	f2200cee44	[CI skip] Merge pull request #2516 from svr333/RenameMessage ... Change not-valid to invalid	2020-10-31 10:08:48 +01:00
TheBusyBiscuit	db673e0fb1	Forgotten a bracket 👀	2020-10-30 23:12:41 +01:00
TheBusyBiscuit	17e0d0ef1a	Update TalismanListener.java	2020-10-30 23:10:07 +01:00
TheBusyBiscuit	3471932050	Update Talisman.java	2020-10-30 23:05:55 +01:00
TheBusyBiscuit	e953eb1c81	Refactored talisman grabbing method	2020-10-30 23:03:44 +01:00
TheBusyBiscuit	6f39ef5b41	Fixed imports	2020-10-30 23:01:06 +01:00
TheBusyBiscuit	bae560bd5d	More formatting	2020-10-30 22:58:57 +01:00
TheBusyBiscuit	21d6281ecd	Some formatting	2020-10-30 22:57:27 +01:00
TheBusyBiscuit	192258fb74	Merge branch 'master' into MoreTalismans	2020-10-30 22:54:36 +01:00
TheBusyBiscuit	210c8d20f4	Fixes #2499	2020-10-30 22:50:16 +01:00
TheBusyBiscuit	24e344e219	Fixed compatibility	2020-10-30 19:58:31 +01:00
TheBusyBiscuit	a3fb6c044b	Fixed logging	2020-10-30 19:54:34 +01:00
TheBusyBiscuit	08d1def90c	Fixed a small mistake	2020-10-30 19:50:05 +01:00
TheBusyBiscuit	f197e26a9c	Did not mean to make this final yet	2020-10-30 19:42:58 +01:00
TheBusyBiscuit	508b5aa198	Refactored AGenerator	2020-10-30 19:37:39 +01:00
TheBusyBiscuit	d6567e4bfa	Refactored AContainer	2020-10-30 19:31:22 +01:00
Moritz Kempe	8324f5d830	Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into master	2020-10-30 13:25:44 +01:00
svr333	33f0d0a4bc	Change not-valid to invalid	2020-10-29 15:06:52 +01:00
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
Sfiguz7	386a9b6b95	Smallest documentation fix ever	2020-10-25 19:00:30 +01: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
TheBusyBiscuit	e9ad3ee357	Finished Cargo Filter implementation	2020-10-25 02:47:25 +02: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
uiytt	e13694c063	Fixed name	2020-10-23 19:05:32 +02:00
uiytt	f6a3366aac	imports order	2020-10-23 17:36:58 +02:00
uiytt	c56a55dd69	Again Formatting fix ... I will never see the end of these things ...	2020-10-23 17:31:27 +02:00
CURVX	f5af271445	Little refractoring, changes req. by TTB	2020-10-22 23:58:54 +05:30
uiytt	95a2dc08d4	Formatting fix	2020-10-22 16:06:11 +02:00
svr333	03edaa53a3	Merge branch 'MoreTalismans' of https://github.com/svr333/Slimefun4 into MoreTalismans	2020-10-21 22:29:18 +02:00
svr333	6a250d6d00	Fix requested changes	2020-10-21 22:28:59 +02:00
Moritz Kempe	d15be35e0b	Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into master	2020-10-21 08:12:41 +02:00
CURVX	4f762b37b6	Fixes#2447	2020-10-20 22:48:53 +05:30
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
TheBusyBiscuit	24806ab5d0	Adjusted CargoNet implementation	2020-10-20 14:22:17 +02:00
TheBusyBiscuit	aaec763a78	Added ItemFilter	2020-10-20 13:56:21 +02: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
Moritz Kempe	e9d2d28c43	Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into master	2020-10-19 07:36:07 +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
TheBusyBiscuit	c4bf0ecdd2	First step towards a task	2020-10-18 01:44:32 +02: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	07eba9319a	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into ... bee-armor Conflicts: src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunBootsListener.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java	2020-10-17 13:28:30 +02:00
TheBusyBiscuit	9f3e2bba7c	[CI skip] Removed a troublesome config setting	2020-10-17 13:22:22 +02:00
TheBusyBiscuit	b08532b2e5	Merge branch 'master' into master	2020-10-17 13:20:31 +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
Moritz Kempe	92696226e4	fixes PR Explosive tools not working with silk touch ... Explosive Tools no longer ignore their SILK_TOUCH enchantment. Fixes PR #2460	2020-10-17 11:58:56 +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
uiytt	f987e6b85d	Added unit test for event ... I'm not so sure about this. I've never writed any tests before	2020-10-15 17:34:56 +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
TheBusyBiscuit	4a32858ee9	[CI skip] Updated MockBukkit	2020-10-13 20:09:36 +02:00
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
Senne Van Rompaey	db95cca3fb	Merge branch 'master' into MoreTalismans	2020-10-12 19:59:16 +02: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
Senne Van Rompaey	4d474de290	Merge branch 'master' into MoreTalismans	2020-10-12 00:57:11 +02:00
svr333	b0b5c5a47f	Simplify to talisman.isItem()	2020-10-12 00:20:39 +02:00
svr333	125239f173	Refactor and rename methods	2020-10-12 00:19:19 +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
TheBusyBiscuit	4a91e99be6	[CI skip] Restructuring test classes	2020-10-11 01:02:39 +02: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	d63d6189a9	Merge branch 'master' into performance/cobblestone	2020-10-10 13:49:10 +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
svr333	64684d86c3	Reduce to local scoop	2020-10-09 16:49:06 +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
svr333	b042fbd3a4	Add check for ProtectionManagers	2020-10-08 22:34:18 +02:00
svr333	1cfc8aec90	Refactor (no build errors)	2020-10-08 22:15:30 +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
svr333	dc21ec5752	Merge branch 'MoreTalismans' of https://github.com/svr333/Slimefun4 into MoreTalismans	2020-10-08 18:23:15 +02:00
svr333	172dfc0610	Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into MoreTalismans	2020-10-08 18:22:23 +02:00
svr333	7c030c736f	Refactor (still build errors)	2020-10-08 18:21:00 +02:00
TheBusyBiscuit	ddd8ccec6b	Imports go brrrrrr	2020-10-08 18:12:34 +02:00
TheBusyBiscuit	43284f1534	Merge branch 'master' into performance/cobblestone	2020-10-08 16:19:03 +02:00
TheBusyBiscuit	2d00f3e704	Merge branch 'master' into tags	2020-10-08 16:16:11 +02:00
svr333	82716dd808	Fix resurrected_talisman lore	2020-10-08 15:30:25 +02:00
svr333	73cbbc3b54	Improve recipes of new Talismans	2020-10-08 15:29:46 +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
LinoxGH	b5c917f719	Fixed the lore.	2020-10-08 16:00:26 +03:00
LinoxGH	4bf08db1d1	Merge branch 'master' into EnergyConnector	2020-10-08 15:53:08 +03:00
TheBusyBiscuit	26066f2e6c	Refactoring	2020-10-08 14:45:21 +02:00
TheBusyBiscuit	01d233af4d	Merge pull request #2402 from NCBPFluffyBear/gps-permission-fix ... GPS Control Panel and GEO Scanner access checks	2020-10-08 14:37:16 +02:00
NCBPFluffyBear	90ccbb2261	Organized imports	2020-10-07 17:37:41 -05:00
svr333	b722dc2a00	Update lore	2020-10-08 00:20:35 +02:00
TheBusyBiscuit	08ed8b21c8	Merge branch 'bee-armor' into beeArmor	2020-10-07 22:14:39 +02:00
NCBPFluffyBear	b577c1e4a3	Did changes	2020-10-07 13:45:49 -05:00
TheBusyBiscuit	126ccf3d01	Formatting	2020-10-07 18:43:55 +02:00
TheBusyBiscuit	7c3fc99b3a	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into ... tags Conflicts: src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemSetting.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosiveTool.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/implementations/tools/TestClimbingPick.java	2020-10-07 18:38:26 +02:00
TheBusyBiscuit	fc26f959b6	[CI skip] Small formatting correction	2020-10-07 18:30:21 +02:00
TheBusyBiscuit	e4ddc7c452	[CI skip] Enforce OTBS.	2020-10-07 18:27:01 +02:00
poma123	cd00848795	Merge branch 'master' into tags	2020-10-07 17:55:26 +02:00
TheBusyBiscuit	ed8f0e243b	Fixes #2405	2020-10-07 17:48:53 +02:00
TheBusyBiscuit	c3302d8cbd	Merge branch 'master' into tags	2020-10-07 17:44:27 +02:00
LinoxGH	eb572a1a77	Merge branch 'master' into EnergyConnector	2020-10-07 18:10:50 +03:00
svr333	a6a29509c7	Fix remaining issues	2020-10-07 17:02:42 +02:00
svr333	5e39920e59	Remove static's	2020-10-07 16:45:34 +02:00
TheBusyBiscuit	78515a3c61	Merge pull request #2396 from svr333/AddSticksRecipeToTableSaw ... Add sticks recipe to table saw	2020-10-07 16:31:58 +02:00
TheBusyBiscuit	20a9c642fe	Some code cleanup	2020-10-07 16:24:14 +02:00
poma123	7814bdcdee	Merge branch 'master' into tags	2020-10-07 16:11:41 +02:00
Senne Van Rompaey	085ad2cd6b	Merge branch 'master' into MoreTalismans	2020-10-07 16:06:32 +02:00
svr333	a5998773e3	Fix build error	2020-10-07 16:04:02 +02:00
TheBusyBiscuit	80c4242dd7	Merge pull request #2384 from Seggan/master ... Added Elytra Cap	2020-10-07 16:01:45 +02:00
svr333	3747ba4afa	Remove second consumeItem	2020-10-07 15:59:33 +02:00
svr333	a9b8f608ff	Attempt to make it work	2020-10-07 15:54:32 +02:00
Sfiguz7	91a7d9eacd	Why u do dis IntelliJ >:(	2020-10-07 13:37:32 +02:00
Sfiguz7	46dca73e04	Forgot to clean crucible changes off	2020-10-07 13:36:11 +02:00
Sfiguz7	f8be447821	Fixes #2403	2020-10-07 13:32:10 +02:00
Sfiguz7	51d0ac0417	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2020-10-07 13:06:45 +02:00
svr333	85091516db	Add generic fail message	2020-10-07 12:12:02 +02:00
svr333	8ff3b31bf6	Create tryFind method	2020-10-07 12:03:45 +02:00
NCBPFluffyBear	37f0715156	Added permission checks for the GEO Scanner and GPS Control Panel	2020-10-06 19:46:22 -05:00
svr333	db7e39ff10	Fix requested changes	2020-10-07 00:06:32 +02:00
svr333	2eddaef88c	Fix comments	2020-10-07 00:00:22 +02:00
Seggan	1ccd4c14ac	More changes...	2020-10-06 15:41:14 -04:00
Seggan	960d53840a	Moved import	2020-10-06 15:39:15 -04:00
Seggan	20aa5d49dc	Merged ifs	2020-10-06 15:34:37 -04:00
Seggan	d1ede58f85	More requested changes...	2020-10-06 15:12:35 -04:00
TheBusyBiscuit	47590ac972	Merge branch 'master' into tags	2020-10-06 21:07:49 +02:00
TheBusyBiscuit	d09a7e0f93	Fixes #2391	2020-10-06 21:05:39 +02:00
TheBusyBiscuit	07c84af3b5	Added NotConfigurable attribute	2020-10-06 21:01:18 +02:00
TheBusyBiscuit	f98d048b55	[CI skip] Reduced technical debt	2020-10-06 20:20:02 +02:00
svr333	fa394b4d44	Call planks.isPresent()	2020-10-06 19:50:57 +02:00
svr333	a9ce3c1f3e	Try to implement requested feature for RessurectedTalisman	2020-10-06 15:34:18 +02:00
svr333	e6ed632dd0	Refactor + undo placeholder item in displayrecipes	2020-10-06 11:53:51 +02:00
svr333	37242fe64a	Throw out variables	2020-10-06 01:26:23 +02:00
Seggan	db6295616e	Did more requested changes	2020-10-05 17:05:05 -04:00
Seggan	a4dc1428bc	Changed protection check (untested)	2020-10-05 17:02:09 -04:00
svr333	8c44c583cf	Add nullable tag	2020-10-05 23:01:30 +02:00
svr333	6e17cd2cc5	Extract to method	2020-10-05 23:00:44 +02:00
Seggan	4b3e31a8c7	Renamed listener	2020-10-05 16:56:25 -04:00
svr333	d5caaaa13e	Add base for ResurrectedTalisman	2020-10-05 22:46:53 +02:00
svr333	7eb680fa58	Remove redundant new line	2020-10-05 20:15:11 +02:00
svr333	997dce8970	Extract to method && remove redundant if statement	2020-10-05 20:07:56 +02:00
Senne Van Rompaey	94c5068cc2	Move version check ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2020-10-05 20:03:50 +02:00
svr333	038efb8391	Add myself @author	2020-10-05 20:00:31 +02:00
svr333	3ef0a67db6	Add @Nonnull	2020-10-05 19:59:55 +02:00
svr333	9242978a96	Remove redundant if-else && Consume item after output	2020-10-05 19:57:50 +02:00
svr333	51de095404	Add ResurrectedTalisman class	2020-10-05 19:55:27 +02:00
svr333	ff0c2b7984	Change else if to else	2020-10-05 19:37:12 +02:00
svr333	868a7e566b	Change else if to else	2020-10-05 19:34:26 +02:00
svr333	b237d076bf	Add version check	2020-10-05 19:34:00 +02:00
svr333	983bc103d3	Refactor	2020-10-05 18:43:11 +02:00
svr333	fe50d96270	Remove empty line	2020-10-05 18:38:58 +02:00
Sfiguz7	1d1adf9b3e	Added mc version check	2020-10-05 17:25:57 +02:00
svr333	62aa2dd0d8	Simplify displayrecipes and use planks.isTagged()	2020-10-05 17:23:40 +02:00
Sfiguz7	87dedf3492	Swapped order as it makes more sense + consistency	2020-10-05 17:17:16 +02:00
Sfiguz7	cff403a7b9	Added blackstone and basalt to crucible's recipes	2020-10-05 17:15:53 +02:00
Senne Van Rompaey	8675e96e75	Add space ... Co-authored-by: LinoxGH <54643600+LinoxGH@users.noreply.github.com>	2020-10-05 17:11:56 +02:00
Seggan	58e2b9ab3b	Added default annonation	2020-10-05 11:01:58 -04:00
Seggan	bb24bdd837	Merge remote-tracking branch 'upstream/master'	2020-10-05 10:55:26 -04:00
svr333	0e57d94d61	Add Sticks recipe to Table Saw	2020-10-05 16:28:23 +02:00