Slimefun4

mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00

Author	SHA1	Message	Date
TheBusyBiscuit	e523d7849e	Fixes #2662	2021-01-16 11:28:38 +01:00
Daniel Walsh	da2419d414	Fix the infused hopper picking up items with pickup delay Short.MAX_VALUE	2021-01-16 10:26:22 +00:00
TheBusyBiscuit	d678977a03	Fixed formatting, import and small optimization	2021-01-15 11:52:56 +01:00
TheBusyBiscuit	a810458345	[CI skip] Small changes	2021-01-15 11:46:40 +01:00
TheBusyBiscuit	3663a7d43b	Proper error handling and updated changelog	2021-01-15 03:31:33 +01:00
TheBusyBiscuit	1997fe04d8	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into refactoring/holograms	2021-01-15 03:12:41 +01:00
TheBusyBiscuit	5ea34a895d	Fixed holograms cache	2021-01-15 01:37:55 +01:00
TheBusyBiscuit	3ea2fccf25	Fixed docs	2021-01-15 01:34:56 +01:00
TheBusyBiscuit	570908a448	Cache entity names	2021-01-15 01:32:39 +01:00
TheBusyBiscuit	34f24f4d60	Invisible and invulnerable might be a good idea.	2021-01-15 00:29:28 +01:00
TheBusyBiscuit	d84a2e37a3	Lowered purge delay	2021-01-15 00:24:23 +01:00
TheBusyBiscuit	a7d0758692	More work on holograms	2021-01-15 00:16:58 +01:00
ProfElements	58eca5affa	Check for conflicting enchantments, this can probably be better	2021-01-14 16:02:33 -06:00
ProfElements	5cd1d8cb22	appease yaml lint v3	2021-01-14 15:05:08 -06:00
ProfElements	782da8582f	fix researches_en.yml formatting	2021-01-14 14:56:13 -06:00
ProfElements	fada355fe5	Add research and make Book Binder recipe slightly harder	2021-01-14 14:39:28 -06:00
TheBusyBiscuit	84d2d99097	not done yet	2021-01-14 20:44:56 +01:00
TheBusyBiscuit	739e7a7a9a	Merge branch 'master' into chore/has-unlocked	2021-01-14 14:44:57 +01:00
TheBusyBiscuit	ac590fdde3	Fixes #2721	2021-01-14 14:41:09 +01:00
TheBusyBiscuit	05b67869a8	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into features/multi-categories Conflicts: src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/BookSlimefunGuide.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java	2021-01-14 12:41:53 +01:00
TheBusyBiscuit	ae4e4bed73	Merge branch 'master' into fixes/blocks	2021-01-14 12:35:57 +01:00
TheBusyBiscuit	5d4e22c4b5	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into chore/has-unlocked Conflicts: src/main/java/io/github/thebusybiscuit/slimefun4/core/categories/LockedCategory.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/BookSlimefunGuide.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/TickerTask.java src/main/java/me/mrCookieSlime/Slimefun/api/Slimefun.java	2021-01-14 12:25:37 +01:00
TheBusyBiscuit	7826b2359a	Finished fix for #2636 and fixed a threading issue with BlockStates	2021-01-14 11:58:52 +01:00
TheBusyBiscuit	43109ab2d3	Merge branch 'master' into performance/cobblestone	2021-01-14 11:16:39 +01:00
ProfElements	23049b64fa	Make request changes, simpliflied BookBinder	2021-01-13 15:25:28 -06:00
ProfElements	088a08952b	Make requested changes, made combineEnchantments better generally	2021-01-13 14:35:17 -06:00
Daniel Walsh	9be11921c7	Merge branch 'master' into fixes/blocks	2021-01-13 18:50:06 +00:00
Daniel Walsh	2f08066449	Merge pull request #2487 from CURVX/fix/sf-machine-hopper	2021-01-13 18:46:13 +00:00
TheBusyBiscuit	029bc2ae78	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into refactoring/holograms Conflicts: src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/HologramProjector.java	2021-01-13 14:29:18 +01:00
TheBusyBiscuit	6e27ea0ca1	[CI skip] Fixed javadocs	2021-01-13 13:48:56 +01:00
TheBusyBiscuit	faa3219add	Added an additional item warning for illegal stack sizes	2021-01-13 13:15:05 +01:00
TheBusyBiscuit	11a368f97e	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git	2021-01-13 12:46:35 +01:00
TheBusyBiscuit	b0f5768443	[CI skip] Removed a deprecated method	2021-01-13 12:46:16 +01:00
TheBusyBiscuit	89f6b69e80	[CI skip] Merge pull request #2713 from Slimefun/gitlocalize-14728 Updated and improve zh-CN Translation	2021-01-13 12:19:25 +01:00
TheBusyBiscuit	69df04f128	Remove as much old stuff as possible	2021-01-13 11:58:54 +01:00
Nameless	a69226dd76	Translate messages_zh-CN.yml via GitLocalize	2021-01-13 05:23:28 +00:00
CURVX	889ffe4872	Few minor changes	2021-01-13 10:31:45 +05:30
TheBusyBiscuit	f602c6c575	Slimefun but without cs-corelib	2021-01-13 02:51:05 +01:00
TheBusyBiscuit	7339a6ed4b	[CI skip] Refactoring	2021-01-13 02:20:32 +01:00
TheBusyBiscuit	17d11b513e	Merge branch 'master' into fixes/blocks	2021-01-12 19:53:48 +01:00
TheBusyBiscuit	ec8eed58f9	[CI skip] Refactoring	2021-01-12 19:28:12 +01:00
CURVX	a0ab148a65	Cleaned imports pt.2	2021-01-12 23:42:19 +05:30
CURVX	f0e891134b	Cleaned imports	2021-01-12 23:17:23 +05:30
CURVX	19e2f37ac6	Resolve merge conflicts	2021-01-12 21:51:31 +05:30
CURVX	b3b7a22ee9	Changes req. by TTB	2021-01-12 21:42:53 +05:30
CURVX	105a57fb37	Merge pull request #6 from Slimefun/master [CI skip] Update fork	2021-01-12 21:37:20 +05:30
TheBusyBiscuit	3f5fb7c7a7	[Ci skip] Fixed javadocs and improved documentation	2021-01-12 12:03:02 +01:00
TheBusyBiscuit	c92ba89d9a	Merge branch 'master' into performance/cobblestone	2021-01-11 13:58:21 +01:00
TheBusyBiscuit	3777b59596	Merge branch 'master' into fixes/blocks	2021-01-11 13:57:33 +01:00
TheBusyBiscuit	bc8d72b9ab	Small aesthetic change	2021-01-11 13:12:09 +01:00
TheBusyBiscuit	5ed452660f	Fixed elevator order (highest floor first)	2021-01-11 13:07:46 +01:00
TheBusyBiscuit	f6a9150296	Little bit of refactoring	2021-01-11 12:45:11 +01:00
TheBusyBiscuit	7a4712f930	Removed obsolete things	2021-01-11 12:33:49 +01:00
TheBusyBiscuit	7bfb46d3fd	Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/elevator/ElevatorPlate.java Co-authored-by: Sfiguz7 <37039432+Sfiguz7@users.noreply.github.com>	2021-01-11 12:07:46 +01:00
TheBusyBiscuit	85639c75ac	Fixed floor numbers	2021-01-11 11:25:03 +01:00
TheBusyBiscuit	32474a588b	Added ElevatorFloor class from PR #2699	2021-01-11 10:56:46 +01:00
TheBusyBiscuit	a313d8a878	Removed comments	2021-01-11 10:48:54 +01:00
TheBusyBiscuit	e119f762ac	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into features/inventory-elevator Conflicts: src/main/java/io/github/thebusybiscuit/slimefun4/api/events/PlayerPreResearchEvent.java src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java src/main/java/io/github/thebusybiscuit/slimefun4/core/commands/subcommands/OpenGuideCommand.java src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuide.java src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuideImplementation.java src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/SlimefunGuideLayout.java src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/GuideLayoutOption.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/ChestSlimefunGuide.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/gps/ElevatorPlate.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunGuideListener.java	2021-01-11 10:47:18 +01:00
TheBusyBiscuit	577ad2c308	[CI skip] Prepare RC-19	2021-01-11 10:33:12 +01:00
TheBusyBiscuit	4b6610d0b7	[CI skip] Finalized guide refactoring	2021-01-11 10:30:50 +01:00
Daniel Walsh	d4cfe2a0db	Quick fix	2021-01-11 07:57:51 +00:00
Daniel Walsh	116642fcec	Finish up	2021-01-11 07:38:26 +00:00
TheBusyBiscuit	7e48d96fa3	Removed "written book" slimefun guide and disabled elevators	2021-01-11 02:39:54 +01:00
TheBusyBiscuit	93dc77b188	[CI skip] Fixed javadocs	2021-01-11 02:14:49 +01:00
TheBusyBiscuit	2943289c6d	Merge branch 'master' into fixes/blocks	2021-01-10 23:12:34 +01:00
TheBusyBiscuit	c280ec26a0	Merge branch 'master' into fix/broken-book-guide-and-elevator	2021-01-10 23:09:06 +01:00
TheBusyBiscuit	4c879ac3b3	Added AndroidFarmEvent (+ refactored Farmer Androids)	2021-01-10 21:20:43 +01:00
TheBusyBiscuit	47fc037536	[CI skip] Lots of refactoring and documentation * Moved the ProtectionManager to the IntegrationsManager * Refactored static NamespacedKeys to be non-static * Added some documentation	2021-01-10 17:32:47 +01:00
TheBusyBiscuit	f3ed8c0451	[CI skip] Refactoring	2021-01-10 16:21:15 +01:00
TheBusyBiscuit	177637d070	[CI skip] Merge pull request #2703 from Slimefun/gitlocalize-14714 Chinese Taiwan 1/10 (Timings messages and tweaks)	2021-01-10 14:36:31 +01:00
TheBusyBiscuit	3392a11883	[CI skip] Merge pull request #2702 from Slimefun/gitlocalize-14713 Updated Hungarian translations	2021-01-10 14:34:56 +01:00
TheBusyBiscuit	9f3adc1278	[CI skip] Refactored some more I had forgotten	2021-01-10 14:33:48 +01:00
HeroBrineKing	3cd6aeaf29	Translate messages_zh-TW.yml via GitLocalize	2021-01-10 13:07:07 +00:00
TheBusyBiscuit	9c89419d15	[CI skip] Missed one	2021-01-10 14:02:58 +01:00
poma123	c63e09219d	Translate messages_hu.yml via GitLocalize	2021-01-10 13:01:44 +00:00
András Marczinkó	b3c72e984a	Translate messages_hu.yml via GitLocalize	2021-01-10 13:01:43 +00:00
TheBusyBiscuit	22b5421118	Fixed /sf timings --verbose not working correctly (+refactoring)	2021-01-10 13:38:07 +01:00
TheBusyBiscuit	50a1050038	Translate messages_de.yml via GitLocalize	2021-01-10 12:17:21 +00:00
TheBusyBiscuit	73ef76b292	[CI skip] Merge pull request #2697 from Slimefun/gitlocalize-14666 Update Japanese translation files.	2021-01-10 13:08:20 +01:00
TheBusyBiscuit	5c34d26f8d	[CI skip] Fixed a typo	2021-01-10 13:06:22 +01:00
Daniel Walsh	53b6ea131b	Fixy fixy fix	2021-01-09 21:39:15 +00:00
bito-blosh	59e7b5c6f1	Translate recipes_ja.yml via GitLocalize	2021-01-09 21:31:23 +00:00
bito-blosh	daea1d54fc	Translate messages_ja.yml via GitLocalize	2021-01-09 21:31:22 +00:00
TheBusyBiscuit	5dce476dc9	Translate messages_ja.yml via GitLocalize	2021-01-09 21:31:21 +00:00
ProfElements	93997718c0	Make requested changes, removed redundant isCompatible, and make isCompatible return false on else instead of just after the if	2021-01-09 15:25:59 -06:00
Daniel Walsh	d80784c6b3	Merge pull request #2695 from J3fftw1/feature/changed-version-command	2021-01-09 20:41:13 +00:00
Jeffrey Kosse	62285bb858	did requested changes	2021-01-09 21:28:41 +01:00
Jeffrey Kosse	c9a3cc3787	ree	2021-01-09 21:27:57 +01:00
Daniel Walsh	6fcc69bacc	[CI Skip] Merge pull request #2687 from Slimefun/features/verbose-flag	2021-01-09 20:27:26 +00:00
Jeffrey Kosse	4a281c87bc	ree	2021-01-09 21:27:12 +01:00
Jeffrey Kosse	413a74ece4	added annotations	2021-01-09 21:25:26 +01:00
Jeffrey Kosse	1b52417380	removed unused import	2021-01-09 21:23:50 +01:00
Jeffrey Kosse	a5f42f31dd	Changed VersionsCommand to give more info	2021-01-09 20:18:09 +01:00
ProfElements	23d0f0ae2a	Made requested changes.	2021-01-07 14:41:59 -06:00
TheBusyBiscuit	8e2d250b1c	[CI skip] Merge pull request #2691 from Slimefun/gitlocalize-14618 Updated Hungarian translations	2021-01-07 13:56:28 +01:00
TheBusyBiscuit	f9cfe03a9f	[CI skip] Updated translators list	2021-01-07 13:56:10 +01:00
poma123	d15d8009cb	Translate resources_hu.yml via GitLocalize	2021-01-07 11:43:26 +00:00
poma123	c4cc0496ea	Translate messages_hu.yml via GitLocalize	2021-01-07 11:43:22 +00:00
KingDeadZ	a6c8f3b437	Translate messages_hu.yml via GitLocalize	2021-01-07 11:43:21 +00:00
TheBusyBiscuit	e66af680c2	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git	2021-01-07 11:20:12 +01:00
TheBusyBiscuit	47fec04ab6	Small performance optimization for cargo networks	2021-01-07 11:19:48 +01:00
ProfElements	b26376078e	Made requested changes. Defaulted has-custom-level to false because no-bypass is true	2021-01-06 16:03:44 -06:00
TheBusyBiscuit	0a5ca8d9f6	Update messages_vi.yml	2021-01-06 21:33:51 +01:00
CactusTheGuy	8c7f28f11b	Translate researches_vi.yml via GitLocalize	2021-01-06 20:30:21 +00:00
Vương Vinh	3cded3d28b	Translate researches_vi.yml via GitLocalize	2021-01-06 20:30:20 +00:00
nahkd123	3c41b341d1	Translate researches_vi.yml via GitLocalize	2021-01-06 20:30:19 +00:00
Just Mango	c0a06e4862	Translate researches_vi.yml via GitLocalize	2021-01-06 20:30:18 +00:00
TheBusyBiscuit	2734cc9f25	Translate messages_vi.yml via GitLocalize	2021-01-06 20:30:17 +00:00
Just Mango	1ae2adaf2e	Translate messages_vi.yml via GitLocalize	2021-01-06 20:30:15 +00:00
CactusTheGuy	7cda34d47a	Translate messages_vi.yml via GitLocalize	2021-01-06 20:30:14 +00:00
nahkd123	a64cdec153	Translate messages_vi.yml via GitLocalize	2021-01-06 20:30:13 +00:00
TheBusyBiscuit	edd1283dcc	made requested changes	2021-01-06 21:12:22 +01:00
TheBusyBiscuit	e36027fb48	Merge branch 'master' into fixes/blocks	2021-01-06 21:06:26 +01:00
TheBusyBiscuit	22f308884c	[CI skip] Merge pull request #2689 from Slimefun/gitlocalize-14616 Updated portuguese (brazil) translations	2021-01-06 20:58:32 +01:00
TheBusyBiscuit	5fae6f1c37	[CI skip] Updated translators list	2021-01-06 20:57:58 +01:00
Gustavo de Souza	47d5d356d3	Translate messages_pt-BR.yml via GitLocalize	2021-01-06 19:56:19 +00:00
DayOS	389dc388ed	Translate messages_pt-BR.yml via GitLocalize	2021-01-06 19:56:18 +00:00
Marcio	c613d1220f	Translate messages_pt-BR.yml via GitLocalize	2021-01-06 19:56:16 +00:00
Sxigames	58113d9aff	Translate messages_pt-BR.yml via GitLocalize	2021-01-06 19:56:15 +00:00
FaolanMalcadh	1fa59c7d31	Translate messages_pt-BR.yml via GitLocalize	2021-01-06 19:56:14 +00:00
TheBusyBiscuit	a2be3d1255	Translate messages_pt-BR.yml via GitLocalize	2021-01-06 19:56:13 +00:00
krazybeat	a65a61a557	Translate messages_pt-BR.yml via GitLocalize	2021-01-06 19:56:12 +00:00
Gustavo de Souza	cee50cd615	Translate resources_pt.yml via GitLocalize	2021-01-06 19:48:33 +00:00
TheBusyBiscuit	e773e68b4a	Merge branch 'master' into performance/cobblestone	2021-01-06 20:24:54 +01:00
TheBusyBiscuit	10b11e7bdf	Made requested changes	2021-01-06 18:10:32 +01:00
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
svr333	b3ca362df2	Add DisplayRecipes	2020-10-05 16:06:19 +02:00
Seggan	51dd53cae1	Moved elytra cap to magical gadgets	2020-10-05 10:01:38 -04:00
svr333	d64fe94b50	Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into MoreTalismans	2020-10-05 15:58:32 +02:00
svr333	0a19f76787	Use PigZombie over Entity	2020-10-05 15:56:54 +02:00
svr333	b8c2c97766	Add missing import	2020-10-05 15:43:24 +02:00
svr333	6c568bd7d1	Fix imports	2020-10-05 15:38:21 +02:00
svr333	8d3f432158	Use instanceof	2020-10-05 15:37:45 +02:00
svr333	3ca6e612cc	Add @nonnull	2020-10-05 15:33:48 +02:00
svr333	ab5251021a	Fix compile error	2020-10-05 15:30:23 +02:00
svr333	e65341eb0b	Add newline	2020-10-05 15:29:02 +02:00
svr333	a2fb390a8e	Extra code to separate methods	2020-10-05 15:28:43 +02:00
svr333	a01d33fea3	Refactor	2020-10-05 15:25:11 +02:00
svr333	21bf7cf607	Refactor slightly	2020-10-05 15:00:21 +02:00
svr333	ab92df7693	Fix imports	2020-10-05 14:58:53 +02:00
svr333	e1488c0811	Add Zombified piglin conversion	2020-10-05 14:56:40 +02:00
svr333	5ec63f632f	Update lore	2020-10-05 14:20:44 +02:00
TheBusyBiscuit	9c96ee1785	[CI skip] Merge pull request #2392 from comrade-om/updating-wiki-json updated wiki.json	2020-10-05 13:05:10 +02:00
svr333	e240fa1b64	Refactor onPlayerDeath	2020-10-05 12:31:55 +02:00
svr333	961f442733	Update recipe for wise_talisman	2020-10-05 12:18:42 +02:00
svr333	64e39abc62	Update resurrected talisman message	2020-10-05 12:13:46 +02:00
Senne Van Rompaey	133705e287	Use SlimefunPlugin.runSync over scheduler Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2020-10-05 12:11:00 +02:00
svr333	0e1dba507d	Remove redundant .getPlayer()'s	2020-10-05 12:07:16 +02:00
svr333	e08b4b1f17	Refactor onExperienceReceive	2020-10-05 12:05:53 +02:00
TheBusyBiscuit	060170c12d	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags Conflicts: src/test/java/io/github/thebusybiscuit/slimefun4/testing/TestUtilities.java	2020-10-05 10:03:44 +02:00
TheBusyBiscuit	904a9b1ef0	[CI skip] Updated to MockBukit 0.10.0	2020-10-05 10:01:46 +02:00
Om Uparkar	bf625c3371	corrected spelling mistakes and stuff in wiki.json	2020-10-05 11:55:53 +05:30
Seggan	7f1bddb759	Merge branch 'text_revisions'	2020-10-04 22:05:22 -04:00
Seggan	3dcd5942aa	Changed some linguistic things (Biscuit needs to be an English professor)	2020-10-04 22:03:48 -04:00
Seggan	d6df2ea00c	Added crash protection type	2020-10-04 21:59:10 -04:00
Om Uparkar	12038c2c96	updated wiki.json	2020-10-05 03:35:03 +05:30
Seggan	8bbef4c911	Did some requested changes	2020-10-04 16:08:42 -04:00
Seggan	f87a1d3660	Added research check	2020-10-04 15:07:11 -04:00
Seggan	107125802c	Forgot to change id. Reverted back to setDamage()	2020-10-04 15:02:21 -04:00
svr333	d5d7960a56	Add missing brackets	2020-10-04 21:00:53 +02:00
svr333	49578b7b51	Fix grammar	2020-10-04 20:59:52 +02:00
Senne Van Rompaey	207d69a09b	Uppercase talisman	2020-10-04 20:56:34 +02:00
Senne Van Rompaey	b5b62bc48c	Fix imports	2020-10-04 20:56:13 +02:00
Seggan	1dbdd077ec	Updated recipe	2020-10-04 14:43:30 -04:00
Seggan	70be1c38d0	Did requested changes	2020-10-04 14:42:50 -04:00
Senne Van Rompaey	a1d5d474fc	Remove unused scheduler var	2020-10-04 20:35:41 +02:00
Senne Van Rompaey	f5e5484697	Remove unnecessary import	2020-10-04 20:33:42 +02:00
Senne Van Rompaey	ef12fc3d01	Add text entries for resurrected_talisman	2020-10-04 20:29:14 +02:00
Senne Van Rompaey	74107cf963	Add Talisman of the Resurrected	2020-10-04 20:28:39 +02:00
TheBusyBiscuit	2ac5899abc	Whoops	2020-10-04 13:44:04 +02:00
TheBusyBiscuit	b32dc0b727	@poma123 for the rescue	2020-10-04 13:40:41 +02:00
TheBusyBiscuit	655b429f0d	Added a new super tag	2020-10-04 13:31:52 +02:00
TheBusyBiscuit	7cab529a2b	Merged master into tags	2020-10-04 13:19:54 +02:00
TheBusyBiscuit	76e42fa9af	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags	2020-10-04 13:17:13 +02:00
TheBusyBiscuit	078e749679	Added a new Unit test for Slimefun Tags	2020-10-04 13:04:21 +02:00
TheBusyBiscuit	5753def8e9	Hey unit tests, you work now, k pls?	2020-10-04 12:42:59 +02:00
TheBusyBiscuit	c8d2bea162	Maybe now? 👀	2020-10-04 12:16:32 +02:00
b10n1k	91a5b56947	Define a constant instead of duplicating "backpacks."	2020-10-04 12:09:04 +02:00
TheBusyBiscuit	ceadd2147f	Added a debug line to finally fix this unit test	2020-10-04 11:51:03 +02:00
TheBusyBiscuit	2ff105dabe	Maybe fixed the unit tests?	2020-10-04 11:22:56 +02:00
TheBusyBiscuit	4df4f6d4c9	More Climbing Pick unit tests which may give us better context?	2020-10-04 11:04:35 +02:00
LinoxGH	7dffd84687	Update ResearchSetup.java	2020-10-04 09:06:21 +03:00
LinoxGH	38f891ca98	Some code improvements. (at least that's what was meant to be done)	2020-10-04 09:01:24 +03:00
LinoxGH	6347e2f6ca	Merge branch 'master' into beeArmor	2020-10-04 08:48:05 +03:00
TheBusyBiscuit	50777ac546	A bit of code cleanup and docs	2020-10-04 02:55:11 +02:00
TheBusyBiscuit	8bbdc37130	Refactored Climbing Picks and added Tags	2020-10-04 02:28:59 +02:00
TheBusyBiscuit	0e6fc92e28	Merge branch 'master' into tags	2020-10-04 00:46:37 +02:00
TheBusyBiscuit	de17060070	Merge pull request #2383 from LinoxGH/SfGuideEvent Added SlimefunGuideOpenEvent.	2020-10-04 00:40:15 +02:00
TheBusyBiscuit	87196ef3b9	Merge pull request #2385 from Mooy1/master Speed can affect enchanter/disenchanter times, fixed pom typo	2020-10-04 00:40:01 +02:00
LinoxGH	dbe8755e4a	Update src/main/java/io/github/thebusybiscuit/slimefun4/api/events/SlimefunGuideOpenEvent.java Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2020-10-04 01:04:41 +03:00
Mooy1	e33c70e189	removed accidental space	2020-10-03 16:33:29 -05:00
Mooy1	766d0bbc53	Speed can affect enchanter/disenchanter times, fixed pom typo	2020-10-03 16:27:54 -05:00
Seggan	d9aceea4d6	Changed recipe	2020-10-03 17:27:22 -04:00
LinoxGH	ca76411c40	Update SlimefunGuideListener.java	2020-10-04 00:26:29 +03:00
Senne Van Rompaey	2b39865f42	Add event logic for resurrection_talisman	2020-10-03 23:26:25 +02:00
LinoxGH	2ed707b3b3	Update SlimefunGuideOpenEvent.java	2020-10-04 00:25:27 +03:00
Seggan	99e0c542ae	Moved crash helmet item declaration	2020-10-03 17:22:03 -04:00
Seggan	b540bc05bc	Crash helmet now works	2020-10-03 17:20:29 -04:00
Senne Van Rompaey	682c899754	Add Talisman of the Resurrected	2020-10-03 23:10:27 +02:00
LinoxGH	f7c3a5b052	Did some more requestes changes.	2020-10-04 00:09:52 +03:00
LinoxGH	4316f83a00	Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunGuideListener.java Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>	2020-10-04 00:06:20 +03:00
LinoxGH	0e530fe13a	Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunGuideListener.java Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>	2020-10-04 00:06:13 +03:00
Senne Van Rompaey	8cd9a4e2f8	Add ResearchSetup entry for wise_talisman	2020-10-03 22:58:29 +02:00
LinoxGH	fc999ae60d	Update SlimefunGuideListener.java	2020-10-03 23:57:27 +03:00
Senne Van Rompaey	aefb51cc27	Add text entries for wise_talisman	2020-10-03 22:57:20 +02:00
Senne Van Rompaey	a7c48cec64	Create Talisman of the Wise	2020-10-03 22:57:02 +02:00
LinoxGH	41fc987083	Did more requested changes.	2020-10-03 23:56:51 +03:00
LinoxGH	a222295b03	Did a requested change.	2020-10-03 23:39:06 +03:00
Seggan	23efd62c49	Added crash helmet listener and research	2020-10-03 16:31:27 -04:00
Seggan	9e0485e526	Added crash helmet	2020-10-03 16:21:39 -04:00
TheBusyBiscuit	e1a8c6f52e	Added caveman talisman tag	2020-10-03 22:21:01 +02:00
LinoxGH	5e038d1cc8	And this is the last build error. Hopefully...	2020-10-03 23:20:51 +03:00
LinoxGH	4b2f70203c	Merge branch 'master' into EnergyConnector	2020-10-03 23:19:04 +03:00
LinoxGH	6d887b8abf	Fixed some build errors.	2020-10-03 23:17:09 +03:00
LinoxGH	869051b093	Merge branch 'master' into SfGuideEvent	2020-10-03 23:09:25 +03:00
LinoxGH	2cfbaf3ca6	Added GuideOpenEvent.	2020-10-03 23:05:23 +03:00
TheBusyBiscuit	6b3ae3b1cf	Merge branch 'master' into tags	2020-10-03 22:05:13 +02:00
LinoxGH	d72a60aed1	Added GuideOpenEvent.	2020-10-03 23:04:39 +03:00
TheBusyBiscuit	9ccdfa4655	Merge pull request #2378 from svr333/AddAllCaratGoldsToOreCrusher Add remaining carat golds to ore crusher	2020-10-03 22:03:40 +02:00
poma123	3ec39ec16a	Merge branch 'master' into tags	2020-10-03 21:46:28 +02:00
TheBusyBiscuit	b6a3b38294	Merge pull request #2377 from poma123/fix/cartography-table fixes #2357 Cartography Table fix	2020-10-03 21:29:26 +02:00
poma123	b1a07c0337	Minor improvements	2020-10-03 21:18:36 +02:00
poma123	cb97a89f98	Added a separate version check	2020-10-03 21:12:01 +02:00
LinoxGH	d782470945	Fixed a couple issues.	2020-10-03 21:59:59 +03:00
Senne Van Rompaey	4c0bd29cfa	Add empty line in lore Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>	2020-10-03 20:56:28 +02:00
LinoxGH	f6492e74fb	Added the research to language files.	2020-10-03 21:48:36 +03:00
LinoxGH	4f233a631a	Added Energy Connector.	2020-10-03 21:45:32 +03:00
Senne Van Rompaey	06bf6229fa	Update lore with correct chance	2020-10-03 20:43:31 +02:00
Senne Van Rompaey	2c47a786b8	Narrow talisman down to only ores	2020-10-03 20:27:20 +02:00
Senne Van Rompaey	d70f4df845	Update lore of talisman	2020-10-03 20:06:46 +02:00
Senne Van Rompaey	aba43c5365	Buff chance to 50%	2020-10-03 20:06:18 +02:00
Senne Van Rompaey	ee9b0e90ad	Chance.ToLowerCase()	2020-10-03 19:05:07 +02:00
Senne Van Rompaey	b9750917a6	Rebalance yield results	2020-10-03 17:02:36 +02:00
Senne Van Rompaey	178fc6eb22	Rename Hastier to Caveman	2020-10-03 16:52:49 +02:00
Senne Van Rompaey	7a366aa5ce	Change haste amplifier to 2	2020-10-03 15:15:01 +02:00
Senne Van Rompaey	7301ca834f	Add event listener to BreakBlockEvent for Hastier talisman	2020-10-02 22:04:53 +02:00
Senne Van Rompaey	357f325792	Add message entry for hastier talisman	2020-10-02 22:04:21 +02:00
Senne Van Rompaey	4692bce343	Add entry to researches_en	2020-10-02 21:53:53 +02:00
Senne Van Rompaey	90d0019cb6	Add chance and proper duration	2020-10-02 21:53:27 +02:00
Senne Van Rompaey	add31a38e0	Set up research for TALISMAN_HASTIER	2020-10-02 21:34:52 +02:00
Senne Van Rompaey	a00e640a6c	Add Talisman of the Hastier	2020-10-02 19:53:01 +02:00
poma123	9605ed4d1f	Merge branch 'master' into performance/cobblestone	2020-10-02 14:51:18 +02:00
poma123	59c1683295	Added version check	2020-10-02 14:38:57 +02:00
Senne Van Rompaey	642abb78c8	Add remaining carat golds to ore crusher	2020-10-02 14:33:36 +02:00
poma123	93fc7ff3ab	Formatting	2020-10-01 22:13:47 +02:00
poma123	76bc9b1192	Fixed capitalization	2020-10-01 21:25:56 +02:00
TheBusyBiscuit	8c850cf181	Merge pull request #2371 from poma123/feature/sf-cheat-seasonal-categories Added seasonal categories to the Cheat Sheet	2020-10-01 21:05:40 +02:00
poma123	af3156a43b	Requested changes	2020-10-01 21:01:37 +02:00
poma123	48b78a8af4	Requested changes	2020-10-01 20:58:09 +02:00
poma123	2cf0ca8188	Added javadocs and nullability annotations	2020-10-01 20:49:54 +02:00
TheBusyBiscuit	a8f1bfa706	Merge pull request #2374 from andrefpoliveira/fix-issue-2351 Update GrapplingHookListener	2020-10-01 20:45:32 +02:00
LinoxGH	50e48ed87c	Merge branch 'master' into tags	2020-10-01 21:42:50 +03:00
Roland Metivier	bfc221a7a5	Replace w/break instead	2020-10-01 12:52:16 -05:00
Roland Metivier	b327c55b5f	Remove redundant return statements	2020-10-01 12:49:05 -05:00
Roland Metivier	a074e7cc17	Fix formatting	2020-10-01 12:32:17 -05:00
poma123	30603d9bf5	Added an EventHandler for Cartography Table	2020-10-01 19:12:09 +02:00
Roland Metivier	cbc48584bc	Attempt to fix bug #2360	2020-10-01 11:28:29 -05:00
poma123	3948031dec	Requested changes	2020-10-01 18:06:07 +02:00
poma123	affab6ab80	Revert changes	2020-10-01 17:52:26 +02:00
BuildTools	c86e59b626	Removed redundance	2020-10-01 11:55:30 +01:00
BuildTools	85ebe5322b	Item verification	2020-10-01 11:50:55 +01:00
BuildTools	b6391160a7	Fixed Import	2020-10-01 11:21:03 +01:00
TheBusyBiscuit	6238b57080	Merge pull request #2370 from poma123/fix/necrotic-skull Made Necrotic Skull unplaceable	2020-10-01 11:01:19 +02:00
BuildTools	60c71fe560	Fixed Import	2020-10-01 09:40:19 +01:00
BuildTools	618698fa07	Update GrapplingHookListener	2020-10-01 09:28:26 +01:00
poma123	a1c973a817	Requested changes	2020-09-30 22:13:41 +02:00
poma123	1175bbca40	Added seasonal categories to the Cheat Sheet	2020-09-30 21:35:06 +02:00
poma123	5f7efbd5a6	Made Necrotic Skull unplaceable	2020-09-30 20:14:26 +02:00
poma123	e852837764	Added EntityInteractHandler cancellation	2020-09-30 19:57:54 +02:00
TheBusyBiscuit	fda74388a6	[CI skip] Internal changes to custom model data	2020-09-30 11:59:55 +02:00
TheBusyBiscuit	775275c661	Merge branch 'master' into performance/cobblestone	2020-09-29 20:59:10 +02:00
TheBusyBiscuit	20de967306	Improvements to block ticking	2020-09-29 20:38:41 +02:00
TheBusyBiscuit	e7097e2c2b	[CI skip] Reduced technical debt, refactoring and improved documentation	2020-09-29 20:19:38 +02:00
TheBusyBiscuit	277ecb4a29	Merge branch 'master' into tags	2020-09-29 18:57:38 +02:00
poma123	362299c650	Sorted imports	2020-09-29 15:26:20 +02:00
poma123	57a80ed8a6	Requested changes	2020-09-29 15:24:45 +02:00
poma123	dc318217aa	Added Javadocs	2020-09-29 15:24:17 +02:00
poma123	56ba9f7496	Added event cancellation	2020-09-29 15:07:17 +02:00
TheBusyBiscuit	839d408105	[CI skip] Updated discord invite urls	2020-09-28 21:59:18 +02:00
TheBusyBiscuit	362b7bda63	Merge branch 'master' into tags	2020-09-28 16:01:30 +02:00
TheBusyBiscuit	395713cd52	Merge pull request #2354 from LinoxGH/patch-6 Possibly fixed #2353	2020-09-28 15:53:26 +02:00
TheBusyBiscuit	a674a38f2a	Merge branch 'master' into tags	2020-09-28 15:07:29 +02:00
LinoxGH	fdd3dbbb4e	Update AbstractCargoNode.java	2020-09-27 21:41:25 +03:00
TheBusyBiscuit	89ff9d8dc2	Merge pull request #2348 from flaxeneel2/grapplinghooks Pull request for an additional customizable option in grappling hooks	2020-09-27 20:13:57 +02:00
flaxeneel2	a82680b9fa	commenting fixes	2020-09-27 21:16:28 +04:00
flaxeneel2	518f3c2ebc	Made requested changes [+] Used a better name for the boolean [+] replaced Boolean with primitive boolean [+] Used pascal naming system	2020-09-27 16:54:35 +04:00
TheBusyBiscuit	dc551907d2	Merge pull request #2350 from TheSilentPro/backpack-changes Separate player-only and no-permission messages	2020-09-27 00:00:11 +02:00
TheSilentPro	b41c60934e	Fix code consistency	2020-09-26 22:06:23 +02:00
TheBusyBiscuit	75da0b883a	Refactored code	2020-09-26 22:05:47 +02:00
TheSilentPro	4966d3ad4c	Separate player-only and no-permission messages	2020-09-26 21:53:09 +02:00
flaxeneel2	87eb9cb75e	final commit [+] desired feature fully implemented [+] set the default value to false [+] now added option does not mess with despawn-seconds [+] added keepinv boolean to the functions	2020-09-26 20:53:36 +04:00
Ome_R	4d49e1ec8f	Fixed CargoNetworkTask not checking for other slots before dropping items on ground	2020-09-26 17:39:20 +03:00
flaxeneel2	eac3117547	Grappling hook edit [+] Added a setting to allow the grappling hook to stay in inventory instead of being dropped on the floor on use	2020-09-26 17:27:35 +04:00
TheBusyBiscuit	8568ba300a	Small performance optimization and deprecated an old class	2020-09-25 09:46:02 +02:00
TheBusyBiscuit	c0190bfa2d	Merge pull request #2334 from poma123/develop/generator-events Added AsyncReactorProcessCompleteEvent and AsyncGeneratorProcessCompleteEvent	2020-09-23 17:17:25 +02:00
TheBusyBiscuit	99e46fcb2a	[CI skip] Relocated and documented two methods	2020-09-22 19:39:06 +02:00
TheBusyBiscuit	dd11cd0f30	[CI skip] Removed redundant interface	2020-09-22 18:38:40 +02:00
TheBusyBiscuit	a439722062	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git	2020-09-22 18:37:41 +02:00
TheBusyBiscuit	14b96aae5b	Added back dirt_like tag	2020-09-22 15:51:08 +02:00
TheBusyBiscuit	428c8b4774	Added back tall_flowers tag	2020-09-22 15:46:06 +02:00
TheBusyBiscuit	4c530a4813	Merge branch 'master' into tags	2020-09-22 15:37:03 +02:00
TheBusyBiscuit	d35ee992ae	[CI skip] Added another Unit Test	2020-09-21 23:54:21 +02:00
Panda.com	1c0abdd3fe	Did i really get out of bed for this	2020-09-21 23:22:13 +02:00
Panda.com	c8d22fa381	did requested changes	2020-09-21 22:32:04 +02:00
Panda.com	f63d246b82	changed doors to wooden_doors	2020-09-21 22:26:54 +02:00
Panda.com	59f422c757	note to self listen to your notes	2020-09-21 22:16:32 +02:00
Panda.com	b7def0f58d	Added materials to CoalGenerator	2020-09-21 22:14:22 +02:00
TheBusyBiscuit	d4c26f20f0	Merge branch 'master' into beeArmor	2020-09-21 15:59:56 +02:00
TheBusyBiscuit	4412b40709	Merge branch 'master' into tags	2020-09-21 15:59:08 +02:00
TheBusyBiscuit	f3b5581a11	Merge pull request #2336 from Seggan/master Added Energized Capacitor (From Discord suggestion)	2020-09-21 15:47:23 +02:00
TheBusyBiscuit	2f37c2b8b7	Merge branch 'master' into tags	2020-09-21 13:24:44 +02:00
TheBusyBiscuit	5cd1d99b70	Fixes #2322	2020-09-21 13:23:14 +02:00
TheBusyBiscuit	9dfd43fda6	Fixed Climbing Pick having no animation in creative mode	2020-09-21 13:14:56 +02:00
TheBusyBiscuit	cdc495e62b	Fixes #2325	2020-09-21 13:09:45 +02:00
TheBusyBiscuit	0227e0cc30	[CI skip] Reduced technical debt	2020-09-21 12:51:13 +02:00
Seggan	cbafa4c59c	Moved some code and changed energized capacitor recipe	2020-09-20 20:15:32 -04:00
Seggan	5857b85199	Added research text	2020-09-20 12:52:16 -04:00
Seggan	55a384ab87	Made energized capacitor tier 3 (Did I miss any code?)	2020-09-20 12:16:56 -04:00
Seggan	641def8481	Added Energized Capacitor (From Discord suggestion)	2020-09-19 21:43:52 -04:00
poma123	8592051f87	Requested changes	2020-09-19 18:58:38 +02:00
TheBusyBiscuit	749bb972a3	[CI skip] Added a few more annotations	2020-09-19 11:51:02 +02:00
TheBusyBiscuit	23bf314905	Added fluid-sensitive tag	2020-09-19 11:39:35 +02:00
TheBusyBiscuit	9547d51db2	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags Conflicts: CHANGELOG.md src/test/java/io/github/thebusybiscuit/slimefun4/testing/TestUtilities.java	2020-09-19 11:35:41 +02:00
poma123	24a97c59d8	Refactoring	2020-09-19 10:37:33 +02:00
poma123	b98cdcf7d8	Added AsyncReactorProcessCompleteEvent	2020-09-19 10:37:06 +02:00
poma123	fa1aad7bf8	Added AsyncGeneratorProcessCompleteEvent	2020-09-19 10:36:27 +02:00
TheBusyBiscuit	917bcce636	Fixed an issue with ChestTerminal	2020-09-18 10:48:36 +02:00
LinoxGH	cf5a6e0cca	Oops forgot an import.	2020-09-17 15:17:53 +03:00
LinoxGH	a63f3eb886	Some refactoring and optimizations.	2020-09-17 15:16:24 +03:00
LinoxGH	2bad759178	Fixed a little issue.	2020-09-16 21:54:23 +03:00
LinoxGH	d40b6199e9	Shhh noone needs to know about this.	2020-09-16 21:25:04 +03:00
LinoxGH	ad1bfc052c	Refactoring, requested changes and lots of improvement.	2020-09-16 21:16:47 +03:00
TheBusyBiscuit	2b062da47a	Default changed to false	2020-09-15 19:44:01 +02:00
TheBusyBiscuit	1a7de82c45	Added Unit Tests	2020-09-15 19:42:52 +02:00
TheBusyBiscuit	2810019dbe	Visual improvements + config setting for event calling	2020-09-15 12:08:30 +02:00
TheBusyBiscuit	eeff9411a3	Implemented this for androids	2020-09-15 11:09:15 +02:00
TheBusyBiscuit	816e9004ca	Added the enum	2020-09-15 10:58:28 +02:00
Daniel Walsh	07f5687b9f	Merge pull request #2323 from LinoxGH/patch-3	2020-09-13 22:33:13 +01:00
LinoxGH	efe65bcd20	Fixed unit tests.	2020-09-14 00:11:34 +03:00
LinoxGH	19b95331d6	Added fire tag.	2020-09-13 23:55:16 +03:00
LinoxGH	45da395418	Did a requested change.	2020-09-13 23:41:16 +03:00
LinoxGH	2c0c298dfc	Did a requested change.	2020-09-13 23:36:20 +03:00
LinoxGH	4414b3f29b	Fixed indentation.	2020-09-13 23:35:14 +03:00
LinoxGH	8a91cdbfc2	Code formatting.	2020-09-13 23:32:32 +03:00
Panda.com	5b217246b6	fixed issue	2020-09-13 17:48:48 +02:00
TheBusyBiscuit	1e408665a7	[Ci skip] Removed deprecated method	2020-09-13 12:32:30 +02:00
TheBusyBiscuit	a98ff148e6	Jigsaw!	2020-09-13 12:06:43 +02:00
TheBusyBiscuit	b14f0b76c0	Added unbreakable tag	2020-09-13 12:00:45 +02:00
TheBusyBiscuit	a770378025	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags	2020-09-13 11:57:11 +02:00
TheBusyBiscuit	7b10410a70	[Ci skip] A small change	2020-09-13 11:38:04 +02:00
LinoxGH	cff18a32df	Fixed missing import.	2020-09-12 17:34:32 +03:00
LinoxGH	35e0d44b0b	Some refactoring and added a material check.	2020-09-12 17:21:03 +03:00
Silent	03f7e64107	Fixed colors & functionality of cheat sheet	2020-09-12 15:19:07 +02:00
poma123	5112fd25fa	Fixed merge conflicts	2020-09-12 13:02:12 +02:00
poma123	12b32b0856	Merge remote-tracking branch 'upstream/master' into pr/1909	2020-09-12 12:27:24 +02:00
TheBusyBiscuit	8f95cb4f84	[CI skip] Merge pull request #2311 from poma123/fix/typos Fixed some typos	2020-09-11 20:48:20 +02:00
poma123	acd26b68dd	We can use useable anyway	2020-09-11 20:29:23 +02:00
poma123	be5f793695	Fixed a bunch of typos	2020-09-11 20:02:17 +02:00
TheBusyBiscuit	e2c021d270	Merge pull request #2310 from LinoxGH/patch-3 Changed the used sound categories.	2020-09-11 19:52:48 +02:00
LinoxGH	0177ee13dd	Changed the used SoundCategory.	2020-09-11 20:29:28 +03:00
LinoxGH	ca20594032	Added changed the used SoundCategory.	2020-09-11 20:27:38 +03:00
TheBusyBiscuit	ff9a6f7a3e	Fixed Unit Tests	2020-09-11 10:44:00 +02:00
TheBusyBiscuit	ed66ee9b79	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags Conflicts: CHANGELOG.md	2020-09-11 10:33:02 +02:00
NCBPFluffyBear	37c0ce4ce0	Organized imports	2020-09-10 23:52:19 -05:00
TheBusyBiscuit	74edbe499c	Fixes #2238	2020-09-11 00:07:26 +02:00
NCBPFluffyBear	128bc65417	Did requested changes	2020-09-10 16:36:52 -05:00
NCBPFluffyBear	57f52f62c6	Did requested changes	2020-09-10 16:27:50 -05:00
NCBPFluffyBear	6b95ed0293	Added Charge Command	2020-09-10 16:02:03 -05:00
TheBusyBiscuit	6fd90bde4f	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags	2020-09-10 16:19:23 +02:00
poma123	d22f7f31d8	Renamed to AsyncMachineProcessCompleteEvent	2020-09-10 14:36:41 +02:00
poma123	6e4ad1345f	This has to be async	2020-09-10 13:58:58 +02:00
TheBusyBiscuit	6c7af43574	Merge pull request #2304 from poma123/develop/machine-process-complete-event MachineProcessCompleteEvent	2020-09-10 12:16:35 +02:00
TheBusyBiscuit	8a3165e9ba	Fixed some tags and added glass	2020-09-10 00:33:47 +02:00
TheBusyBiscuit	00e71904b2	Merge pull request #2305 from LinoxGH/patch-3 Edited markDirty() to clean connectorCache	2020-09-09 23:33:06 +02:00
LinoxGH	1b80c698c5	Fixed a typo.	2020-09-09 21:36:29 +03:00
TheBusyBiscuit	19c67a2266	Unit Test should no longer fail	2020-09-09 15:52:59 +02:00
LinoxGH	6d6359ce26	Improved the code.	2020-09-09 16:50:04 +03:00
TheBusyBiscuit	9655761ab1	Micro-optimizations Walshy would be proud of	2020-09-09 15:43:44 +02:00
TheBusyBiscuit	035e35a067	Implemented tags in more occurences	2020-09-09 15:34:58 +02:00
poma123	8f34365aaa	Removed redundant annotations	2020-09-09 14:51:21 +02:00
poma123	87543ccb83	Fixed javadocs	2020-09-09 14:35:17 +02:00
poma123	a4eb852b19	Added annotations	2020-09-09 14:34:01 +02:00
poma123	25bd60fd0e	Fixed a typo	2020-09-09 14:26:01 +02:00
poma123	274c5ada2f	Minor improvement	2020-09-09 14:25:47 +02:00
poma123	e628ad2685	Added MachineProcessCompleteEvent	2020-09-09 14:25:20 +02:00
TheBusyBiscuit	f2eeadb24b	[CI skip] Some minor changes	2020-09-09 13:18:43 +02:00
TheBusyBiscuit	7fdf10cc8b	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags Conflicts: src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java	2020-09-08 12:37:25 +02:00
TheBusyBiscuit	3a5c1ee22b	[CI skip] Removed deprecated class	2020-09-08 12:22:57 +02:00
TheBusyBiscuit	23143cd576	Merge pull request #2297 from LinoxGH/patch-2 Possibly fixes #2296.	2020-09-08 12:06:57 +02:00
TheBusyBiscuit	fe22c5e9ed	Fixes #2300 (and deprecated bStats)	2020-09-08 12:06:12 +02:00
Daniel Walsh	53dea5e195	Some good old micro-optimisations	2020-09-07 22:38:23 +01:00
LinoxGH	956d8ed078	Did the requested changes.	2020-09-07 18:47:51 +03:00
TheBusyBiscuit	81a8732f41	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags	2020-09-07 13:06:50 +02:00
TheBusyBiscuit	7c8b8e0c59	Discord webhook, please work	2020-09-07 13:02:59 +02:00
TheBusyBiscuit	4fe2aee565	Another mistake	2020-09-07 13:00:15 +02:00
TheBusyBiscuit	7e7fde9a47	Slight correction	2020-09-07 12:59:38 +02:00
TheBusyBiscuit	3220a124aa	Added more Unit Tests	2020-09-07 12:41:04 +02:00
LinoxGH	cdd7dc9232	Forgot to change a small part.	2020-09-07 13:38:12 +03:00
LinoxGH	7cd2e53bf1	Possibly fixes #2296 .	2020-09-07 13:22:59 +03:00
TheBusyBiscuit	5b72faddc3	Implemented tags	2020-09-07 11:08:39 +02:00
TheBusyBiscuit	b09c4af900	Added documentation	2020-09-07 03:12:31 +02:00
TheBusyBiscuit	06498e3f63	Added Unit Test and loop detection	2020-09-07 01:13:25 +02:00
TheBusyBiscuit	773996617d	Added Tags	2020-09-07 00:31:26 +02:00
TheBusyBiscuit	5c0aba7692	[CI skip] Moved Slimefun repository	2020-09-06 17:19:02 +02:00
Ome_R	490db0d719	Fixed teleporters not functioning if the teleport event is cancelled	2020-09-06 12:22:37 +03:00
Nameless	3b9a42713a	Translate researches_zh-CN.yml via GitLocalize	2020-09-06 04:24:14 +00:00
TheBusyBiscuit	4ef4332ffa	Translate messages_zh-CN.yml via GitLocalize	2020-09-06 04:24:10 +00:00
TheBusyBiscuit	be5f1ed8ee	Merge pull request #2285 from NCBPFluffyBear/multitool-offhand-fix Multitool offhand hunger consumption fix	2020-09-05 22:15:47 +02:00
FluffyBear	6e33549006	Got rid of the extra imports	2020-09-05 15:11:29 -05:00
FluffyBear	069b183b68	Changed it back	2020-09-05 15:11:08 -05:00
FluffyBear	c9fd33318e	Did changes	2020-09-05 11:12:14 -05:00
TheBusyBiscuit	2791da3796	A bit redundant	2020-09-05 15:01:26 +02:00
TheBusyBiscuit	ec9133cf8a	Small improvements	2020-09-05 14:45:42 +02:00
TheBusyBiscuit	8061df9b5e	[CI skip] More nullability annotations	2020-09-05 13:56:56 +02:00
TheBusyBiscuit	5f897de0b0	[CI skip] Merge pull request #2287 from TheBusyBiscuit/gitlocalize-12867 messges_es	2020-09-05 09:57:06 +02:00
Luu7	1c1b2251d0	Translate researches_es.yml via GitLocalize	2020-09-04 20:21:14 +00:00
Luu7	d11145d98c	Translate messages_es.yml via GitLocalize	2020-09-04 20:09:41 +00:00
FluffyBear	6f49044998	Applied fix	2020-09-04 10:20:11 -05:00
FluffyBear	6ac3c9698b	Fixed dual wielding problem with shears	2020-09-04 09:29:08 -05:00
TheBusyBiscuit	120d3299ee	[CI skip] Merge pull request #2284 from TheBusyBiscuit/gitlocalize-12841 New pull request	2020-09-04 10:02:31 +02:00
TheBusyBiscuit	0c3cb5db37	[CI skip] Updated it once again	2020-09-04 10:02:20 +02:00
TheBusyBiscuit	deb9e0c711	[CI skip] Updated translator list	2020-09-04 09:57:34 +02:00
FluffyBear	55bf76799f	Got rid of charge command from this branch (Missed something)	2020-09-04 00:54:53 -05:00
FluffyBear	cf1c58dd8b	Got rid of charge command from this branch	2020-09-04 00:54:06 -05:00
FluffyBear	90309dabe1	Fixed multitools consuming hunger when used in offhand	2020-09-04 00:46:26 -05:00
FluffyBear	649d4797c9	Merge pull request #1 from TheBusyBiscuit/master Update to latest	2020-09-04 00:40:03 -05:00
Pierre	1ee04e79b3	Translate messages_fr.yml via GitLocalize	2020-09-03 22:17:25 +00:00
amarcais53	d22c14e5a6	Translate researches_fr.yml via GitLocalize	2020-09-03 18:23:24 +00:00
TheBusyBiscuit	26f9e5f7c6	More annotations and refactoring	2020-09-03 17:19:24 +02:00
TheBusyBiscuit	dd9962d3e2	Small improvement, many annotations	2020-09-03 12:24:49 +02:00
TheBusyBiscuit	cc2dd0dd64	Translate messages_ja.yml via GitLocalize	2020-09-03 05:32:59 +00:00
bito-blosh	af89dba9f6	Translate researches_ja.yml via GitLocalize	2020-09-03 05:32:27 +00:00
TheBusyBiscuit	f4869991ca	Moved Nether goo to the appropriate package (+ more annotations)	2020-09-02 14:47:32 +02:00
TheBusyBiscuit	4ce4388218	[CI skip] More annotations :o	2020-09-02 13:53:10 +02:00
TheBusyBiscuit	c5630791c0	Added item break sound to some tools	2020-09-02 12:19:18 +02:00
TheBusyBiscuit	d0498f51c5	Translate messages_de.yml via GitLocalize	2020-09-02 10:13:36 +00:00
TheBusyBiscuit	2dfa2f139b	Translate researches_de.yml via GitLocalize	2020-09-02 10:13:35 +00:00
TheBusyBiscuit	2fadb47e65	Merge pull request #2277 from TheBusyBiscuit/gitlocalize-12801 Updated TR localization	2020-09-02 12:09:48 +02:00
TheBusyBiscuit	3b28545714	Little tweak	2020-09-02 12:08:36 +02:00
TheBusyBiscuit	f1515edae9	Fixed Synthetic Shulker Shells missing	2020-09-02 12:07:16 +02:00
LinoxGH	4fde84d521	Translate researches_tr.yml via GitLocalize	2020-09-02 10:06:23 +00:00
LinoxGH	7db615fb82	Translate messages_tr.yml via GitLocalize	2020-09-02 10:06:20 +00:00
TheBusyBiscuit	8a6e00a402	Even more annotations	2020-09-02 11:53:42 +02:00
TheBusyBiscuit	71322d95a8	More annotations	2020-09-02 11:27:53 +02:00
TheBusyBiscuit	486253973c	Renamed to Villager Rune	2020-09-02 11:16:45 +02:00
TheBusyBiscuit	eb9837953c	Delete RangedItemSetting.java	2020-09-02 11:13:16 +02:00
TheBusyBiscuit	7da5b9ad35	Merge branch 'master' into experimental	2020-09-02 10:34:13 +02:00
TheBusyBiscuit	f4091e931b	Refactoring and some annotations	2020-09-02 10:31:35 +02:00
TheBusyBiscuit	35c1fa6a23	Fixes #2275	2020-09-01 22:38:22 +02:00
BuildTools	c091c7992f	Removed redundancies, added javadocs, fixed formatting	2020-08-31 18:50:35 -05:00
BuildTools	125c3fe60d	Updated plugin.yml to include new charge command	2020-08-31 15:34:56 -05:00
BuildTools	16ea468c38	Added command to charge items	2020-08-31 15:31:09 -05:00
TheBusyBiscuit	4a6068b078	Refactoring	2020-08-31 20:38:01 +02:00
TheBusyBiscuit	93ff508603	More refactoring	2020-08-31 20:37:24 +02:00
TheBusyBiscuit	759946f5c3	[Ci skip] Reduced technical debt	2020-08-31 20:18:35 +02:00
TheBusyBiscuit	3d22e42bef	Merge pull request #2270 from LinoxGH/master Fixes #2265 <Tested>	2020-08-31 19:56:05 +02:00
TheBusyBiscuit	8073b5dafb	Fixes #2266	2020-08-31 19:49:25 +02:00
LinoxGH	6dba662d4b	Merge branch 'master' into master	2020-08-31 20:34:15 +03:00
TheBusyBiscuit	68b9a0aed8	Fixes #2269 (+ refactoring)	2020-08-31 19:08:15 +02:00
LinoxGH	d95049db27	Did the requested change.	2020-08-31 19:13:23 +03:00
LinoxGH	f740cc7850	Did the requested change.	2020-08-31 19:04:23 +03:00
LinoxGH	fa01e82179	Did the requested changes.	2020-08-31 18:51:21 +03:00
LinoxGH	e2c93c54e5	Fixes #2265 <Tested>	2020-08-31 17:28:26 +03:00
LinoxGH	918edbeeb1	Fixed the javadocs.	2020-08-30 18:42:57 +03:00
LinoxGH	bfc84d03b2	Undid the changes to language files.	2020-08-30 18:26:12 +03:00
LinoxGH	305dd57b39	Did the requested change.	2020-08-30 18:25:08 +03:00
LinoxGH	dffc5758e2	Fixed compilation error.	2020-08-30 18:21:50 +03:00
LinoxGH	a8f6f51724	Added a new message.	2020-08-30 18:15:31 +03:00
LinoxGH	3d0c642477	Added an additional check for Wind Staff	2020-08-30 18:14:39 +03:00
LinoxGH	cdb6eeab96	Did the requested changes.	2020-08-30 18:13:45 +03:00
LinoxGH	e0914af6d9	Fixes #2263	2020-08-30 17:53:39 +03:00
TheBusyBiscuit	6b4f914784	Some more refactoring	2020-08-29 14:20:33 +02:00
TheBusyBiscuit	e3f7e68468	Fixed a merging issue	2020-08-29 14:09:41 +02:00
TheBusyBiscuit	dc233997ae	Merge branch 'master' into refactoring/block-energy	2020-08-29 12:47:50 +02:00
TheBusyBiscuit	ac5d5521ce	Fixes #2260	2020-08-28 23:35:11 +02:00
TheBusyBiscuit	ec6f48e374	[CI skip] Refactoring	2020-08-28 23:35:05 +02:00
TheBusyBiscuit	5bef6a9ec8	Fixes #2257	2020-08-28 23:18:43 +02:00
TheBusyBiscuit	9d740436a7	Merge branch 'master' into experimental	2020-08-28 20:53:20 +02:00
TheBusyBiscuit	83b66232fa	Fixes #2251	2020-08-28 20:03:45 +02:00
LinoxGH	f371a5fda6	Fixed a stupid issue and added some docs.	2020-08-27 20:53:13 +03:00
LinoxGH	8c1cccc390	Forgot about imports.	2020-08-27 20:33:01 +03:00
LinoxGH	fd665843a0	Did requested changes.	2020-08-27 20:20:13 +03:00
LinoxGH	53abf76a35	Fixed Fluid Pump dupe.	2020-08-27 20:08:02 +03:00
TheBusyBiscuit	f97935b5c7	Deleted unused class	2020-08-27 14:29:02 +02:00
TheBusyBiscuit	fcbae02a4b	Fixs #2208	2020-08-27 14:16:09 +02:00
TheBusyBiscuit	4232caf17a	[CI skip] Reduced technical debt	2020-08-27 13:16:38 +02:00
TheBusyBiscuit	b9b3d7f504	[CI skip] Removed deprecated class	2020-08-27 13:00:36 +02:00
TheBusyBiscuit	4dab0c5b47	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into refactoring/block-energy	2020-08-26 17:51:43 +02:00
TheBusyBiscuit	3bc943bdb2	Little bit of refactoring	2020-08-26 14:33:40 +02:00
TheBusyBiscuit	c8ab9e8568	Fixes #1022	2020-08-26 14:31:51 +02:00
TheBusyBiscuit	6e6a953009	Fixes #2249	2020-08-26 12:47:08 +02:00
TheBusyBiscuit	2c319d866f	Fixed Unit Test	2020-08-25 01:17:11 +02:00
TheBusyBiscuit	dba52edc47	Merge branch 'master' into experimental	2020-08-24 21:12:38 +02:00
TheBusyBiscuit	4bc22ab106	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into experimental Conflicts: CHANGELOG.md	2020-08-24 21:12:04 +02:00
TheBusyBiscuit	ecde46616a	Climbing Pick no longer causes fall damage	2020-08-24 20:59:01 +02:00
TheBusyBiscuit	89a5db2593	Fixed Unit Tests for Climbing Pick	2020-08-24 20:45:45 +02:00
TheBusyBiscuit	9e92f64222	Added damageable setting	2020-08-24 20:35:35 +02:00
TheBusyBiscuit	8c2038634f	Fixed dual wielding climbing picks and added messages	2020-08-24 20:31:54 +02:00
TheBusyBiscuit	b81959e7a0	Added dual-wielding to the Climbing Pick	2020-08-24 20:19:24 +02:00
TheBusyBiscuit	076ae6532b	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2020-08-24 18:12:31 +02:00
poma123	7b7c6350c6	Fixed android script editor menu hotkey glitch	2020-08-24 15:30:51 +02:00
TheBusyBiscuit	605862b400	Improved consistency and reduced redundancy	2020-08-24 14:26:11 +02:00
TheBusyBiscuit	a2b2478394	Update EnergyNet.java	2020-08-24 02:18:32 +02:00
TheBusyBiscuit	d998f3ec8c	Merge branch 'master' into refactoring/block-energy	2020-08-24 02:11:59 +02:00
TheBusyBiscuit	155092a321	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 Conflicts: pom.xml	2020-08-23 17:57:13 +02:00
TheBusyBiscuit	f51a19777f	[CI skip] Added more Unit tests	2020-08-23 17:56:38 +02:00
Sfiguz7	89fdf45d28	I said, fixed extra indentation	2020-08-23 17:50:31 +02:00
Sfiguz7	44451d6244	Fixed extra indentation	2020-08-23 17:49:44 +02:00
Sfiguz7	813200b29c	Made requested changes	2020-08-23 15:36:10 +02:00
Sfiguz7	e06d17f8e5	Restored original plugin.yml as pulling hadn't	2020-08-23 13:58:29 +02:00
Sfiguz7	bdd2adc21e	Cleared unused imports I forgot to delete	2020-08-23 13:56:39 +02:00
Sfiguz7	eb66f3e183	Added option to drop excess items on /sf give	2020-08-23 13:54:51 +02:00
TheBusyBiscuit	ec95797cbf	Fixes #2240	2020-08-22 02:38:17 +02:00
TheBusyBiscuit	b36e3e41a8	Reduced technical debt	2020-08-22 02:36:36 +02:00
TheBusyBiscuit	e839ece670	Reduced technical debt	2020-08-22 00:57:44 +02:00
100petr	d6e519c840	Translate messages_cs.yml via GitLocalize	2020-08-21 13:27:22 +00:00
TheBusyBiscuit	95655dc6fc	A few fixes and performance improvements	2020-08-21 15:19:08 +02:00
TheBusyBiscuit	167326292d	Maybe fixes #1951 (+ performance improvements)	2020-08-20 23:25:43 +02:00
TheBusyBiscuit	29092b87c9	Merge branch 'experimental' into IcePick	2020-08-20 22:56:09 +02:00
TheBusyBiscuit	d8d4811974	Merged Nitwit Rune and Shulker Shell PRs	2020-08-20 18:20:25 +02:00
TheBusyBiscuit	65021f7615	Merge branch 'rune' into ShulkerShell	2020-08-20 17:33:27 +02:00
TheBusyBiscuit	88be3e79ff	Merge branch 'master' into refactoring/block-energy	2020-08-20 16:55:35 +02:00
LinoxGH	73d623a0fd	Github Web and its indent issues.	2020-08-20 14:39:31 +03:00
LinoxGH	37bacaa8cb	Apparently SlimefunPlugin.instance is private now.	2020-08-20 14:30:21 +03:00
LinoxGH	bf3b04a4c5	Oops sorry for this silly mistake	2020-08-20 14:19:48 +03:00
LinoxGH	0946b88cd1	Fixed symbol name issues in ClimbingPick.java	2020-08-20 14:11:46 +03:00
LinoxGH	a54e8623d3	Merge branch 'master' into ShulkerShell	2020-08-20 12:21:50 +03:00
LinoxGH	5f78e7a854	Merge branch 'master' into IcePick	2020-08-20 11:43:14 +03:00
Vravinite	310622c3ac	Translate messages_es.yml via GitLocalize	2020-08-19 23:50:04 +00:00
LinoxGH	5f0df75b81	Translate messages_tr.yml via GitLocalize	2020-08-19 12:42:33 +00:00
TheBusyBiscuit	4f3854877b	[CI skip] Merge pull request #2230 from TheBusyBiscuit/gitlocalize-12659 Updated Russian localizations	2020-08-19 14:37:35 +02:00
TheBusyBiscuit	15487fb333	Translate messages_de.yml via GitLocalize	2020-08-19 12:33:36 +00:00
TheBusyBiscuit	9787cf734b	Renamed to Nitwit Rune	2020-08-19 14:31:07 +02:00
SoSeDiK	273e459e26	Translate recipes_ru.yml via GitLocalize	2020-08-19 12:20:10 +00:00
SoSeDiK	dbd5cc1641	Translate messages_ru.yml via GitLocalize	2020-08-19 12:20:08 +00:00
TheBusyBiscuit	b1abf7bb99	Fixed categories	2020-08-19 14:12:51 +02:00
TheBusyBiscuit	8c5d15e311	Increased Bartering chance	2020-08-19 14:11:33 +02:00
TheBusyBiscuit	66fa277014	A few additional changes	2020-08-19 14:07:42 +02:00
TheBusyBiscuit	57b3f06aa6	Merge pull request #2220 from dniym/NitwitRune Added Rune of Unemployment	2020-08-19 13:58:16 +02:00
TheBusyBiscuit	aa22e7c9b2	[CI skip] A bit of refactoring and documentation	2020-08-19 13:54:46 +02:00
dniym	e13e7e1400	Update RuneOfUnemployment.java made requested changes	2020-08-18 15:30:12 -04:00
TheBusyBiscuit	9d4d2060ba	[CI skip] Added a few more strings to translation files	2020-08-18 14:45:51 +02:00
TheBusyBiscuit	6be0709aea	Fixes #2138	2020-08-18 14:18:44 +02:00
TheBusyBiscuit	85b0c80e3f	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2020-08-17 17:31:39 +02:00
TheBusyBiscuit	8e8a87fce6	Fixed ChestTerminal timings showing up as cargo nodes	2020-08-17 17:31:15 +02:00
TheBusyBiscuit	fb47574fe8	Added poma's requested change Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>	2020-08-17 16:27:26 +02:00
TheBusyBiscuit	a10813036b	Added poma's suggested change Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>	2020-08-17 13:30:18 +02:00
TheBusyBiscuit	0f73b62658	Added Walshys suggested change Co-authored-by: Daniel Walsh <walshydev@gmail.com>	2020-08-17 13:30:03 +02:00
TheBusyBiscuit	07c62d5932	Added Walshys suggested change Co-authored-by: Daniel Walsh <walshydev@gmail.com>	2020-08-17 13:29:54 +02:00
TheBusyBiscuit	33f6f039ec	Added Walshys suggested change Co-authored-by: Daniel Walsh <walshydev@gmail.com>	2020-08-17 13:29:44 +02:00
Scott Gomez Andoy	646fb6d523	Translate messages_tl.yml via GitLocalize	2020-08-17 11:26:10 +00:00

... 19 20 21 22 23 ...

5314 Commits