1631 Commits

Author	SHA1	Message	Date
Daniel Walsh	5c5214beba	Fix 2	2019-10-13 17:06:45 +01:00
TheBusyBiscuit	e0d1a71453	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2019-10-13 16:37:28 +02:00
TheBusyBiscuit	819a59d3a4	[CI skip] Micro-optimizations	2019-10-13 16:37:13 +02:00
Daniel Walsh	c17d4f5afc	fix dat	2019-10-13 15:25:57 +01:00
TheBusyBiscuit	a2fe40cfe1	Merge pull request #1174 from WalshyDev/async-player-profile-fetch ... Implement PlayerProfile async fetch	2019-10-13 15:57:02 +02:00
TheBusyBiscuit	b76a7a3e24	[CI skip] Merge pull request #1175 from AlexLander123/fixes ... Fixed NullPointerException when using Pickaxe of the Seeker	2019-10-13 15:56:24 +02:00
AlexLander123	b95b3d2bf4	Logic Correction for PickaxeOfTheSeeker	2019-10-13 21:01:15 +08:00
Daniel Walsh	7c46affc9a	Order timings	2019-10-13 13:42:07 +01:00
AlexLander123	d2581c625d	Performance improvement ... Changed distance() to distanceSquared()	2019-10-13 19:36:02 +08:00
TheBusyBiscuit	d3b3fd15bd	Very small performance optimizations	2019-10-13 13:24:14 +02:00
Daniel Walsh	c128ba872d	*yawn*	2019-10-13 12:15:45 +01:00
AlexLander123	75d568c2dd	Fixed NullPointerException ... Fixed NullPointerException when using Pickaxe of the Seeker	2019-10-13 16:39:01 +08:00
Daniel Walsh	694d36afa6	General improvements and fixes	2019-10-11 23:56:51 +01:00
Daniel Walsh	6b62a45ffa	Added opening messages to locale	2019-10-11 23:11:02 +01:00
TheBusyBiscuit	f62bdf92c0	[CI skip] Little optimization	2019-10-12 00:05:44 +02:00
TheBusyBiscuit	1c7639717e	Added /sf search	2019-10-11 23:54:20 +02:00
Daniel Walsh	8cb37a1850	Implement PlayerProfile async fetch	2019-10-11 22:48:46 +01:00
AlexLander123	5d107de6ac	Readded hasItemMeta() check	2019-10-10 00:14:02 +08:00
AlexLander123	8b8486a2e7	Clarification of code	2019-10-09 22:47:33 +08:00
AlexLander123	691256cefe	Added hasDisplayName check	2019-10-09 22:06:31 +08:00
AlexLander123	8cc822429d	Allow BlockPlacer to place blocks while retaining certain data ... BlockPlacer will set block's name and inventory according to its itemstack.	2019-10-09 21:49:02 +08:00
TheBusyBiscuit	1d509cf52d	Added a Recipe for the Totem of Undying (+ Altered Elytra Scale Recipe)	2019-10-07 20:24:07 +02:00
TheBusyBiscuit	0b4f07ac44	Fixes #1171	2019-10-07 19:24:52 +02:00
TheBusyBiscuit	fb636b0d2a	[CI skip] Merge pull request #1169 from J3fftw1/J3fftw1-patch-6 ... Update SlimefunItems.java	2019-10-07 18:01:00 +02:00
J3fftw1	ca6dac8862	Update SlimefunItems.java	2019-10-07 17:55:21 +02:00
TheBusyBiscuit	e7ed2b6b72	Moved more Items to the new system	2019-10-07 16:09:45 +02:00
TheBusyBiscuit	04d114cd44	Merge pull request #1167 from J3fftw1/master ... Added lightning rune to research and gave it its own research	2019-10-07 15:39:35 +02:00
J3fftw1	18846ba0f0	Update ResearchSetup.java	2019-10-07 13:35:27 +02:00
J3fftw1	bea1b4ead6	Update ResearchSetup.java	2019-10-07 08:15:58 +02:00
J3fftw1	3beaf5c99d	Update ResearchSetup.java	2019-10-07 07:59:16 +02:00
TheBusyBiscuit	2044a4e489	Removed debug message	2019-10-06 19:33:34 +02:00
TheBusyBiscuit	0aa989c9fb	More performance improvements	2019-10-06 19:32:55 +02:00
TheBusyBiscuit	58889c46d0	Fixes #1162 (also more performance improvements)	2019-10-06 17:04:34 +02:00
TheBusyBiscuit	64bd72a695	Some minor refactoring, also added 2 new recipes to the Crucible	2019-10-06 14:32:06 +02:00
TheBusyBiscuit	3540faa65c	More performance improvements	2019-10-06 13:31:57 +02:00
TheBusyBiscuit	dc12ac6e6f	Migrated more items to the new system	2019-10-06 00:11:42 +02:00
TheBusyBiscuit	065c9e8f21	Reduced technical debt + Improved Guide Performance	2019-10-05 23:49:25 +02:00
TheBusyBiscuit	da7eff0d87	Added support for all wooden fences in Multiblock structures	2019-10-05 23:49:11 +02:00
TheBusyBiscuit	7800058ed1	Fixes #1157 (Also updated to CS-CoreLib2 v0.6.1)	2019-10-05 22:16:55 +02:00
TheBusyBiscuit	c0142a6f30	Walshy is a god	2019-10-05 22:02:11 +02:00
TheBusyBiscuit	12efdbd510	Minor sanity changes	2019-10-05 21:51:18 +02:00
TheBusyBiscuit	6797620c2a	Hopefully fixed a minor flaw	2019-10-05 21:35:48 +02:00
TheBusyBiscuit	76095333fe	A very small performance improvement on radiation.	2019-10-05 21:30:48 +02:00
TheBusyBiscuit	2e77d306e2	Armor Task is now asynchronous	2019-10-05 21:16:21 +02:00
TheBusyBiscuit	9ac4e7eeea	Fixed a little mistake	2019-10-05 21:04:42 +02:00
TheBusyBiscuit	6314d7e422	Minor change	2019-10-05 20:49:03 +02:00
TheBusyBiscuit	b07d87fecd	Improved Armor Checks	2019-10-05 20:44:11 +02:00
TheBusyBiscuit	b36f9cd3b5	Huge stability and performance improvements (Ticks are skipped upon lag)	2019-10-04 14:19:57 +02:00
TheBusyBiscuit	e772b55e83	Huge stability and performance improvements (Ticks are skipped upon lag)	2019-10-04 14:13:45 +02:00
TheBusyBiscuit	5d1c36734e	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2019-10-04 14:05:22 +02:00
TheBusyBiscuit	7bbf47639c	Ticks may now be skipped if the server is falling behind.	2019-10-04 14:05:16 +02:00
TheBusyBiscuit	561445768d	Merge pull request #1152 from WalshyDev/performance-improvements ... Some performance improvements	2019-10-04 14:01:24 +02:00
TheBusyBiscuit	2c9445a971	Merge pull request #1149 from J3fftw1/master ... Changed values of sound decaying	2019-10-04 14:01:18 +02:00
Daniel Walsh	5b188bcfaa	Merge unmerged items and don't always merge first item	2019-10-04 12:49:23 +01:00
Daniel Walsh	23c39dc81e	Thanks :coookie:	2019-10-04 12:40:24 +01:00
Daniel Walsh	a0b4a32fe0	fix typo	2019-10-04 12:39:42 +01:00
Daniel Walsh	fe3cdc6e8d	Few more things	2019-10-04 12:38:48 +01:00
Daniel Walsh	8e766f644a	CargoNet cleanup	2019-10-04 12:34:15 +01:00
Daniel Walsh	bcb79afc9c	TimerTask cleanup	2019-10-04 12:27:24 +01:00
J3fftw1	27521167a8	Update InfusedHopper.java	2019-10-04 13:02:06 +02:00
Daniel Walsh	5ac4920756	Some performance improvements	2019-10-04 11:14:27 +01:00
TheBusyBiscuit	ebed466d69	Some Performance Improvements	2019-10-04 03:29:53 +02:00
TheBusyBiscuit	804bea553b	Added Sweet Berry Juice	2019-10-04 03:11:40 +02:00
TheBusyBiscuit	5c40e689e9	Significant performance improvement for items crafted after this build	2019-10-04 02:54:46 +02:00
TheBusyBiscuit	d0329b185d	Massive performance improvements for Items created after this build	2019-10-04 02:39:38 +02:00
TheBusyBiscuit	14cf3fee37	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 ... Conflicts: src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java	2019-10-04 02:21:38 +02:00
Daniel Walsh	581c2fc65d	Changes	2019-10-04 01:14:09 +01:00
TheBusyBiscuit	4a339c6f80	Updated even more staff	2019-10-04 01:57:10 +02:00
Daniel Walsh	31f82b899f	move id to SlimefunItemStack	2019-10-04 00:45:51 +01:00
Daniel Walsh	db0ed1a46b	I want a cookie!	2019-10-04 00:31:47 +01:00
Daniel Walsh	3255269e2b	Small fix	2019-10-04 00:29:46 +01:00
TheBusyBiscuit	4a2ca7599b	Further updates	2019-10-04 01:25:19 +02:00
TheBusyBiscuit	49f1247b13	Removed unused Heavy Armor	2019-10-04 01:21:30 +02:00
Daniel Walsh	160f471445	Implement persistent data to getByItem and isItem	2019-10-04 00:20:36 +01:00
TheBusyBiscuit	4882a97ff5	Updated some outdated stuff	2019-10-04 01:02:51 +02:00
Daniel Walsh	9ba54a79cf	Implement persistent ID	2019-10-03 23:37:13 +01:00
Daniel Walsh	2d8cb7c30b	Some constructor cleanup	2019-10-03 22:58:48 +01:00
J3fftw1	9aab707291	Update MagnetTask.java	2019-10-03 23:08:41 +02:00
J3fftw1	01971edbc6	Merge pull request #1 from J3fftw1/J3fftw1-patch-1 ... Update TeleportationSequence.java	2019-10-03 23:01:04 +02:00
J3fftw1	69bcd30399	Merge pull request #2 from J3fftw1/J3fftw1-patch-2 ... Update ArmorListener.java	2019-10-03 23:00:50 +02:00
J3fftw1	b1a94fe5ec	Merge pull request #3 from J3fftw1/J3fftw1-patch-3 ... Update RitualAnimation.java	2019-10-03 23:00:43 +02:00
J3fftw1	445312e31f	Update MagnetTask.java	2019-10-03 22:57:41 +02:00
J3fftw1	7c8dfac1b4	Update RitualAnimation.java	2019-10-03 22:54:11 +02:00
J3fftw1	a30650d16d	Update ArmorListener.java	2019-10-03 22:51:36 +02:00
J3fftw1	55efcc454c	Update TeleportationSequence.java	2019-10-03 22:46:18 +02:00
TheBusyBiscuit	f818668ba0	You can no longer cheat in Multiblocks (+ Code cleanup)	2019-10-03 18:06:14 +02:00
TheBusyBiscuit	fdb0d011ef	Reworked some internal stuff	2019-10-02 13:54:59 +02:00
TheBusyBiscuit	74ee019603	Smeltery now shows all its "1 component"-Recipes in the Guide	2019-10-01 18:48:13 +02:00
TheBusyBiscuit	695ed72f0c	Changed Ignition Chamber Recipe	2019-10-01 18:47:48 +02:00
TheBusyBiscuit	db0b6dfa90	Fixed Stone Chunk -> Cobblestone Recipe not working	2019-10-01 18:47:40 +02:00
TheBusyBiscuit	431892abb2	Updated some deprecated methods	2019-10-01 17:04:09 +02:00
TheBusyBiscuit	21582610ad	Updated to CS-CoreLib2 v0.5.6	2019-10-01 13:14:50 +02:00
TheBusyBiscuit	ff85e4d894	Merge pull request #1138 from WalshyDev/feature/guide-search ... Guide Search!	2019-10-01 02:58:56 +02:00
TheBusyBiscuit	7cac093419	Updated CS-CoreLib2 and refactored commands	2019-10-01 02:57:58 +02:00
Daniel Walsh	00ef4d59e8	I hate life	2019-09-30 19:36:08 +01:00
Daniel Walsh	0743d05311	Localization	2019-09-30 19:33:44 +01:00
Daniel Walsh	b0b55f13ad	Oops, unused import	2019-09-30 18:14:54 +01:00
Daniel Walsh	570319b5ae	Switch to MenuHelper.awaitChatInput	2019-09-30 18:06:50 +01:00
TheBusyBiscuit	3d8d9ed624	Merge pull request #1139 from SoSeDiK/npe ... Fix two NPEs when loading without CS-CoreLib	2019-09-30 18:40:57 +02:00
SoSeDiK	abf00e038b	Use tabs everywhere	2019-09-30 19:33:35 +03:00
SoSeDiK	c56225d051	Fix NPE on disabling without CS-CoreLib	2019-09-30 19:21:33 +03:00
SoSeDiK	f45c40e103	Fix NPE on loading without CS-CoreLib	2019-09-30 19:20:08 +03:00
TheBusyBiscuit	4bb9abd247	Fixed stable-builds Updater	2019-09-30 00:04:43 +02:00
Daniel Walsh	631403ae4e	Add notice for stable ... Some people disable auto-updates on dev builds because they can have issues. Let's instead advertise the stable branch	2019-09-29 22:57:15 +01:00
WalshyDev	52f078a025	Finish search	2019-09-28 16:13:23 +01:00
WalshyDev	fd4f92326d	Cleanup	2019-09-27 20:40:51 +01:00
TheBusyBiscuit	0a540aa16a	Removed the Saw Mill from Slimefun	2019-09-27 21:11:26 +02:00
TheBusyBiscuit	cff45aae66	Updated CS-CoreLib2 dependency	2019-09-27 21:08:57 +02:00
TheBusyBiscuit	c4a5705c44	Fixes #1130	2019-09-27 20:28:49 +02:00
TheBusyBiscuit	48aabe752d	Fixes #1129	2019-09-27 09:02:17 +02:00
TheBusyBiscuit	c82f61a58d	Merge branch 'master' into constructor_cleanup	2019-09-26 20:54:01 +02:00
TheBusyBiscuit	229b0f8e87	Fixed double-registration of basic machine recipes	2019-09-26 20:32:59 +02:00
TheBusyBiscuit	dd5965eeac	Reduced technical debt	2019-09-26 20:22:28 +02:00
TheBusyBiscuit	fd76555ea1	Fixed Basic Machines not showing all recipes	2019-09-26 20:09:03 +02:00
Liruxo	b7ec184364	Added Deprecated Compatibility Constructors	2019-09-26 18:42:47 +02:00
Liruxo	2e340be7ff	Multiblock constructor refactor	2019-09-26 18:07:58 +02:00
TheBusyBiscuit	3a4a1ac96e	Merge pull request #1127 from TheBusyBiscuit/geo ... GEO Miner	2019-09-26 15:36:36 +02:00
TheBusyBiscuit	526a209fa3	Update	2019-09-26 15:32:20 +02:00
TheBusyBiscuit	4f38890dc3	Added GEO Miner Research	2019-09-26 15:25:42 +02:00
TheBusyBiscuit	2b89c41e3e	Updated GEO Scanner	2019-09-26 15:23:27 +02:00
TheBusyBiscuit	965cdc8165	Adjusted ore spawn-rates	2019-09-26 15:22:42 +02:00
TheBusyBiscuit	3ed959ed1c	Updated GEO-Miner	2019-09-26 15:15:33 +02:00
TheBusyBiscuit	016b1c84eb	Added GEO Miner	2019-09-26 15:09:19 +02:00
TheBusyBiscuit	cc29dd6333	Refactoring	2019-09-26 13:53:36 +02:00
TheBusyBiscuit	65962d3689	Added more bStats Charts	2019-09-26 12:58:35 +02:00
TheBusyBiscuit	5a591e4f7e	Tweaked Auto-Updater	2019-09-26 08:21:49 +02:00
TheBusyBiscuit	98b6607db6	Updated Miner Hologram	2019-09-25 14:19:34 +02:00
TheBusyBiscuit	f4e2c97327	Added GEO-Miner	2019-09-25 14:17:06 +02:00
TheBusyBiscuit	dcee66839f	Added Portable GEO-Scanner, Uranium Resources and improved gps	2019-09-23 17:50:35 +02:00
TheBusyBiscuit	28a4205e8c	Added pagination to Machine Recipes (Resolves #1005)	2019-09-21 21:40:54 +02:00
TheBusyBiscuit	a31a30b6af	Reduced technical debt	2019-09-21 16:21:10 +02:00
TheBusyBiscuit	0f7f31f8ba	Reduced technical debt	2019-09-21 14:54:55 +02:00
TheBusyBiscuit	d18409bfc4	Refactored Messages	2019-09-21 13:59:15 +02:00
TheBusyBiscuit	1af7c8cbf0	Fixes #1116	2019-09-21 13:04:36 +02:00
ajan-12	e6a6d2838f	Fixed a little typo.	2019-09-19 08:54:23 +03:00
TheBusyBiscuit	25ee04bb89	Merge pull request #1117 from WalshyDev/fix/fix-storm-staff-usages ... Improve storm staff usages	2019-09-11 12:21:38 +02:00
TheBusyBiscuit	580931d729	Updated to CS-CoreLib 2 v0.5.1	2019-09-11 11:53:05 +02:00
WalshyDev	0219de80b2	remove unused import	2019-09-10 22:37:40 +01:00
WalshyDev	4468c8a382	Fix lore	2019-09-10 21:58:28 +01:00
WalshyDev	d3b13e62f5	Fix storm staff usage bug ... Also improve the way it is done, there was no way to go through all possible usages checking the lore on each one... Downside: It will reset the usage on current items due to it being saved/loaded in a different way	2019-09-10 21:36:34 +01:00
WalshyDev	b70d4fc258	Fix hasUnlocked usages	2019-09-10 16:28:08 +01:00
WalshyDev	181165300e	Replace item checks with ID checks	2019-09-10 16:10:26 +01:00
WalshyDev	b7714efbac	Fix #1104 ... Also improves performance and formatting	2019-09-10 15:25:47 +01:00
TheBusyBiscuit	4662144309	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2019-09-09 20:59:07 +02:00
TheBusyBiscuit	256428489b	Increased technical debt via deprecation :P	2019-09-09 20:58:46 +02:00
TheBusyBiscuit	d5d15a60ec	Merge pull request #1099 from LinoxGH/master ... Fixes #1098.	2019-09-09 12:45:24 +02:00
TheBusyBiscuit	dfc23277a8	Merge pull request #1100 from xH3LLRAIZ3Rx/master ... Changed item-permission message to be per item rather than one global list	2019-09-09 12:45:13 +02:00
Alex Mercer	834fddf84d	Changed permission-message and other things	2019-09-08 19:10:53 -07:00
LinoxGH	a00d2c9f59	Hopefully fizes #1098 in a better way.	2019-09-08 17:20:12 +03:00
Alex Mercer	ead25ceaac	Changed it again	2019-09-08 06:22:15 -07:00
Alex Mercer	22fcb992fd	Changed the way it works	2019-09-08 06:04:50 -07:00
Alex Mercer	7c50faf140	Changed item-permission to be per item rather than one global list	2019-09-08 03:47:09 -07:00
ajan-12	643cfadaf4	Fixes #1098.	2019-09-08 10:12:45 +03:00
ajan-12	23819a1d83	Fixes #1085 for real.	2019-09-07 00:15:17 +03:00
ajan-12	5c9ba0a94f	Hopefully fixes #1085	2019-09-06 23:57:47 +03:00
TheBusyBiscuit	bc7d92468c	Fixes #1096	2019-09-06 17:35:24 +02:00
TheBusyBiscuit	8fd19dd134	Minor Tweaks and Changes	2019-09-06 13:01:45 +02:00
TheBusyBiscuit	eea131878e	Merge pull request #1094 from xH3LLRAIZ3Rx/master ... Changed Slimefun Guide sound to Page Turn	2019-09-06 12:25:04 +02:00
Alex Mercer	1eebe69dae	Changed pitch	2019-09-06 03:11:37 -07:00
TheBusyBiscuit	c7040d09be	Reduced technical debt + Fixes #1095	2019-09-06 10:34:17 +02:00
Alex Mercer	41caa1b623	Merge remote-tracking branch 'origin/master'	2019-09-05 22:25:50 -07:00
Alex Mercer	d2defd9a89	Changed volume	2019-09-05 22:25:36 -07:00
Alex Mercer	6341c19906	Merge branch 'master' into master	2019-09-05 22:06:03 -07:00
Alex Mercer	c1c0c99bc8	Changed Slimefun Guide sound to Page Turn	2019-09-05 22:05:06 -07:00
Alex Mercer	0b717626ba	Changed Slimefun Guide sound to Page Turn	2019-09-05 21:59:34 -07:00
TheBusyBiscuit	9293808357	Fixed Multiblocks.	2019-09-06 02:16:45 +02:00
TheBusyBiscuit	5a5651ab38	Fixes #1093	2019-09-06 01:50:53 +02:00
TheBusyBiscuit	32e280879e	Merge pull request #1092 from WalshyDev/master ... Micro-optimisations	2019-09-06 00:27:58 +02:00
TheBusyBiscuit	e0d12f467a	Removed unused imports	2019-09-06 00:27:50 +02:00
WalshyDev	df7390f9b3	Small improvement	2019-09-05 23:24:09 +01:00
TheBusyBiscuit	26750e5cfc	Reduced technical debt	2019-09-06 00:17:14 +02:00
TheBusyBiscuit	fd77bb6a00	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2019-09-06 00:10:50 +02:00
TheBusyBiscuit	96b45868ad	Removed unneeded Holograms	2019-09-06 00:10:37 +02:00
WalshyDev	9ff32fb72e	Micro-optimisations	2019-09-05 23:09:25 +01:00
TheBusyBiscuit	4fd148418c	Merge pull request #1082 from LinoxGH/master ... Adding Soulbound Rune with the requested changes.	2019-09-05 23:46:17 +02:00
TheBusyBiscuit	5015ddc560	Refactored Code	2019-09-05 23:30:16 +02:00
Liruxo	3f0f794863	Review suggestions implemented	2019-09-05 22:31:08 +02:00
Liruxo	4f89c2d6e5	MultiBlockListener overhaul	2019-09-05 21:41:59 +02:00
ajan-12	7399e1f0d1	Hopefully did the requested changes for the last time.	2019-09-05 22:36:27 +03:00
ajan-12	63a261d51c	Did the requested changes vol.infinite	2019-09-05 20:43:36 +03:00
ajan-12	05bd9337ab	Did the requested changes vol.4	2019-09-05 20:35:16 +03:00
ajan-12	f4da4d2423	Did the requested changes vol.3	2019-09-05 17:38:04 +03:00
ajan-12	441291a9c2	Merge branch 'master' of https://github.com/LinoxGH/Slimefun4	2019-09-05 17:18:48 +03:00
ajan-12	ebde63a04e	Did the requested changes vol.2	2019-09-05 17:16:10 +03:00
LinoxGH	84303891d7	Merge branch 'master' into master	2019-09-05 15:08:19 +03:00
ajan-12	a98517f8cc	Did the requested changes.	2019-09-05 15:02:26 +03:00
TheBusyBiscuit	307a4394ff	Improved Guide Performance + Refactoring	2019-09-05 13:43:41 +02:00
TheBusyBiscuit	25e6dd337b	Improved Slimefun Guide Performance	2019-09-05 13:29:19 +02:00
TheBusyBiscuit	861ddba869	Fixes #1084	2019-09-04 20:55:45 +02:00
TheBusyBiscuit	b4dff80dcc	Reduced technical debt	2019-09-04 19:51:03 +02:00
TheBusyBiscuit	38b2112aaf	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2019-09-04 19:42:26 +02:00
TheBusyBiscuit	f623c5d2ea	Reduced technical debt	2019-09-04 19:42:17 +02:00
TheBusyBiscuit	6ad5bd8324	Merge pull request #1078 from xH3LLRAIZ3Rx/master ... Added item-permission in messages	2019-09-04 09:54:33 +02:00
TheBusyBiscuit	af40186418	Updated dependencies	2019-09-04 09:54:24 +02:00
Alex Mercer	6811147292	Changed the code one more time	2019-09-03 23:55:20 -07:00
TheBusyBiscuit	a1a3ee68ef	Added Tier 2 Coal and Lava Generators	2019-09-03 20:35:21 +02:00
ajan-12	7501dc9afb	Actual commit adding the Soulbound Rune. ... - Added Soulbound Rune with a research and recipe. - Did the requested changes. - Moved isSoulbound check from DamageListener.java to SlimefunManager.java. - Added a new ItemHandler called ItemDropHandler.	2019-09-03 20:30:58 +03:00
ajan-12	2a8c6265b0	Added Soulbound Rune. ... - Added Soulbound Rune with a research and recipe. - Did the requested changes. - Moved isSoulbound check from DamageListener.java to SlimefunManager.java. - Added a new ItemHandler called ItemDropHandler.	2019-09-03 20:25:59 +03:00
TheBusyBiscuit	4651baf13f	Code Cleanup	2019-09-03 16:44:59 +02:00
TheBusyBiscuit	9277b120e1	Refactored Code	2019-09-03 16:29:46 +02:00
TheBusyBiscuit	00de4d9361	Refactored Code	2019-09-03 13:09:58 +02:00
TheBusyBiscuit	4282bfee5d	Reduced technical debt	2019-09-03 13:06:24 +02:00
Alex Mercer	b694c9edac	Changed code again	2019-09-03 01:51:20 -07:00
TheBusyBiscuit	a49877964e	Reduced technical debt	2019-09-02 23:14:48 +02:00
Alex Mercer	0961c8bf1a	Changed code	2019-09-02 04:43:11 -07:00
TheBusyBiscuit	38c4333d72	Retextured Categories	2019-09-02 13:36:34 +02:00
Alex Mercer	b8e2eede55	Changed messages.item-permission to tooltips.item-permission	2019-09-02 03:31:06 -07:00
Alex Mercer	a8151ec58b	Added item-permission	2019-09-02 03:19:10 -07:00
TheBusyBiscuit	6473988df4	Fixed Durability Enchantment on damageable Items	2019-09-02 11:27:32 +02:00
TheBusyBiscuit	dd14816504	Added Blue Ice to Freezer	2019-09-02 11:25:06 +02:00
TheBusyBiscuit	4d52b034f1	Fixed Explosive Tools	2019-09-02 11:12:42 +02:00
TheBusyBiscuit	b5d9e11bad	Added a bunch more machine Recipes to be shown in the guide	2019-09-02 11:12:34 +02:00
TheBusyBiscuit	3368c56c62	Reduced technical debt	2019-09-02 10:24:53 +02:00
TheBusyBiscuit	b075779f6b	Fixed Error Reports	2019-09-02 10:05:17 +02:00
TheBusyBiscuit	40f2ef862a	Minor performance improvement	2019-09-02 09:56:35 +02:00
TheBusyBiscuit	5ba6ea867f	Updated to CS-CoreLib2 v0.3.10	2019-09-02 01:31:52 +02:00
TheBusyBiscuit	74ecde2c58	Code cleanup	2019-09-02 01:07:32 +02:00
TheBusyBiscuit	d51e906300	Reduced technical debt	2019-09-02 00:15:19 +02:00
TheBusyBiscuit	41bbbdd3dc	Fixed various Bugs	2019-09-01 23:35:19 +02:00
TheBusyBiscuit	6dc24d0ff2	Merge pull request #1076 from LinoxGH/master ... Fixes #253	2019-09-01 23:21:47 +02:00
TheBusyBiscuit	90327e6908	Refactoring	2019-09-01 23:21:01 +02:00
ajan-12	08f672600a	A little code improvement.	2019-09-01 23:54:59 +03:00
ajan-12	9c9a3bb6ba	Implementing postRegister() and doing the requested change.	2019-09-01 23:07:16 +03:00
ajan-12	5ed152b1e7	Fixing a mistake in syncing.	2019-09-01 22:59:43 +03:00
ajan-12	bafd526a79	Syncing with the changes in main repo.	2019-09-01 22:49:27 +03:00
ajan-12	fa056c8d04	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 ... # Conflicts: # src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/GrapplingHook.java	2019-09-01 22:46:27 +03:00
ajan-12	4b821c1559	Some code cleanup and finally fixed #253.	2019-09-01 22:42:04 +03:00
TheBusyBiscuit	7ec4924665	Fixed default Items.yml for BlockPlacer	2019-09-01 21:02:10 +02:00
TheBusyBiscuit	01fe513532	Small bug fix	2019-09-01 20:43:35 +02:00
TheBusyBiscuit	92219b6435	Fixed Lightning Rune Recipe	2019-09-01 20:43:05 +02:00
TheBusyBiscuit	dd0bb1ef8b	Minor Bug Fixes	2019-09-01 20:29:16 +02:00
ajan-12	1cd47fd3dd	Removed more redundant lines.	2019-09-01 21:02:52 +03:00
ajan-12	2a9eeaaa96	Code Refactored and fixed grappling hook dupe.	2019-09-01 21:00:19 +03:00
ajan-12	bb7bf903d3	Forgot to register the grappling hook.	2019-09-01 20:55:11 +03:00
ajan-12	8278d00dcf	Optimized imports a bit.	2019-09-01 20:41:11 +03:00
TheBusyBiscuit	2fbad51e53	Fixed damageable Items	2019-09-01 19:37:29 +02:00
ajan-12	3ec3efb137	Hopefully Fixed #253.	2019-09-01 20:34:26 +03:00
TheBusyBiscuit	b76328168b	Fixed BlockPlacer	2019-09-01 19:32:38 +02:00
TheBusyBiscuit	224510d2cc	Added ItemConsumptionHandler	2019-09-01 19:31:12 +02:00
TheBusyBiscuit	3e7554f497	Merge pull request #1074 from LinoxGH/master ... A quick hotfix for diet cookies crashing the server.	2019-09-01 18:54:51 +02:00
TheBusyBiscuit	42cdd8494b	Fixed Storm Staff bypassing PVP-free Worlds	2019-09-01 18:54:18 +02:00
TheBusyBiscuit	2056e62e01	Fixed Explosive Shovel duplication bug	2019-09-01 18:53:02 +02:00
ajan-12	a819d4ece2	Fixing Diet Cookie crashing the server.	2019-09-01 19:39:28 +03:00
TheBusyBiscuit	d9ce39f93b	Refactored Code	2019-09-01 14:47:03 +02:00
TheBusyBiscuit	dbe37ee6a9	Added Lightning Rune	2019-09-01 14:31:08 +02:00
TheBusyBiscuit	7b5f44a7f0	Merge pull request #1067 from LinoxGH/master ... Added Storm Staff.	2019-09-01 14:09:49 +02:00
TheBusyBiscuit	bb50dcaf73	Reduced technical debt	2019-09-01 13:47:39 +02:00
LinoxGH	06a7072b4c	Adding no PvP message.	2019-09-01 14:32:42 +03:00
TheBusyBiscuit	76004c3df9	Reduced technical debt	2019-09-01 11:42:03 +02:00
LinoxGH	0cd5e79ddd	Merge branch 'master' into master	2019-09-01 12:41:22 +03:00
ajan-12	d5a8bade3e	Code cleanup and doing the requested changes.	2019-09-01 12:38:43 +03:00
TheBusyBiscuit	ed1bf015b7	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2019-08-31 20:34:28 +02:00
TheBusyBiscuit	8be6f9cebb	Hotfix	2019-08-31 20:34:10 +02:00
TheBusyBiscuit	4180a2f2c2	Merge pull request #1071 from Sfiguz7/master ... Removed unnecessary array creations	2019-08-31 20:28:19 +02:00
TheBusyBiscuit	6c4de35327	Reduced Code Smells	2019-08-31 20:27:59 +02:00
TheBusyBiscuit	10f3dae550	Fixed Color Character in Elevator Floor names	2019-08-31 20:09:25 +02:00
Sfiguz7	08cdd595ba	Removed unnecessary array creations	2019-08-31 19:45:39 +02:00
TheBusyBiscuit	edeef7c14d	Logger Conversion Pt.5	2019-08-31 17:52:20 +02:00
TheBusyBiscuit	2f5177b785	Refactored Code	2019-08-31 15:52:52 +02:00
TheBusyBiscuit	6eb3cee4a2	Reduced technical debt	2019-08-31 15:52:15 +02:00
TheBusyBiscuit	91f31d361a	Logger Conversion Pt.4	2019-08-31 15:07:27 +02:00
TheBusyBiscuit	8d8c229081	Logger Conversion Pt.3	2019-08-31 14:17:25 +02:00
TheBusyBiscuit	89240ccb95	Large Refactoring	2019-08-31 13:40:20 +02:00
TheBusyBiscuit	01fd2cd38c	Logger Conversion Pt.2	2019-08-31 12:54:54 +02:00
TheBusyBiscuit	c293605312	Logger Conversion Pt.1	2019-08-31 12:12:38 +02:00
TheBusyBiscuit	e78e749e94	Insanely huge Refactoring	2019-08-31 11:36:45 +02:00
TheBusyBiscuit	b9be211b7f	Merge pull request #1070 from Sfiguz7/master ... Conditional structures dupe codes cleaning	2019-08-31 09:39:48 +02:00
LinoxGH	4c30764dac	Improved the Storm Staff recipe a bit.	2019-08-31 02:15:41 +03:00
LinoxGH	cc4a678750	Fixed bugs about Storm Staff. ... - Changed "1 Uses left" to "1 Use left". - Fixed the recipe. - Fixed durability not working. - Fixed a server crash when item breaks.	2019-08-31 02:13:56 +03:00
Sfiguz7	4fe72148a2	Conditional structures dupe codes cleaning	2019-08-30 23:57:30 +02:00
TheBusyBiscuit	fb0cd04b81	Refactored Network classes	2019-08-30 23:55:40 +02:00
TheBusyBiscuit	d8d7212a29	Merge branch 'master' into master	2019-08-30 23:23:12 +02:00
TheBusyBiscuit	9aa7845293	Refactored Code	2019-08-30 23:21:34 +02:00
Sfiguz7	d5f8fb465f	Fixes#2	2019-08-30 23:21:33 +02:00
Sfiguz7	3da4dce1f6	Fixes	2019-08-30 23:12:47 +02:00
TheBusyBiscuit	24ec50e072	Removed even more empty methods	2019-08-30 23:11:37 +02:00
Sfiguz7	e253f1dc43	Static non-final names compliance changes	2019-08-30 22:58:46 +02:00
TheBusyBiscuit	43e6b5875c	Made a constant out of this variable	2019-08-30 22:58:09 +02:00
TheBusyBiscuit	2940db51ad	Refactoring	2019-08-30 22:56:44 +02:00
Sfiguz7	29a8d81345	Local variables name compliance changes	2019-08-30 22:49:18 +02:00
TheBusyBiscuit	591160a45f	Removed more empty methods	2019-08-30 22:41:58 +02:00
LinoxGH	60977a01c6	Doing the requested changes.	2019-08-30 23:39:14 +03:00
TheBusyBiscuit	1615f5948d	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2019-08-30 22:30:18 +02:00
TheBusyBiscuit	d14ef3891a	Cleared another empty method	2019-08-30 22:30:03 +02:00
TheBusyBiscuit	1b27287f15	Merge pull request #1068 from Sfiguz7/master ... Removed empty methods	2019-08-30 22:18:51 +02:00
TheBusyBiscuit	1de54daf5d	Refactoring	2019-08-30 22:18:36 +02:00
Sfiguz7	a5eeb7c414	Removed empty methods	2019-08-30 22:05:49 +02:00
TheBusyBiscuit	dc1de711b0	Removed debug message	2019-08-30 21:51:37 +02:00
TheBusyBiscuit	f9bbfdc869	Changed Pressure Chamber and Table Saw Slabs	2019-08-30 21:48:11 +02:00
LinoxGH	9818d8bb08	Adding the Storm Staff to SlimefunSetup.java.	2019-08-30 22:32:37 +03:00
LinoxGH	efdb9d12dc	Adding the Storm Staff Research.	2019-08-30 22:29:57 +03:00
LinoxGH	6cca1f8833	Adding Storm Staff to SlimefunItems.java and removing redundant "&7"s.	2019-08-30 22:28:40 +03:00
TheBusyBiscuit	adb8194d84	Reduced technical debt for Androids	2019-08-30 21:14:46 +02:00
TheBusyBiscuit	b6be4af90d	Updated SlimefunBlockHandler	2019-08-30 21:02:55 +02:00
TheBusyBiscuit	5ec7a27b2b	Fixed Multiblocks	2019-08-30 20:41:39 +02:00
TheBusyBiscuit	0fd44d2136	Reduced technical debt	2019-08-30 13:47:58 +02:00
TheBusyBiscuit	7afcfda89a	Fixes #1064	2019-08-30 12:54:22 +02:00
TheBusyBiscuit	c378697f42	More Cleanup	2019-08-30 12:47:22 +02:00
TheBusyBiscuit	7e63ad9040	Removed a bunch of deprecated code	2019-08-30 12:13:45 +02:00
TheBusyBiscuit	5793508144	Fixed Exception when doing /sf stats	2019-08-30 12:00:28 +02:00
TheBusyBiscuit	4cd9628786	Retextured Categories + fixed server-crash when using Flasks of ... Knowledges really fast	2019-08-30 11:49:45 +02:00
TheBusyBiscuit	1ec935b334	More Code Cleanup	2019-08-30 11:28:27 +02:00
TheBusyBiscuit	09354e0be1	Refactored code	2019-08-30 11:15:26 +02:00
TheBusyBiscuit	2e89de4d3a	Code cleanup	2019-08-30 09:21:49 +02:00
TheBusyBiscuit	5fa929e633	Reduced technical debt	2019-08-30 01:40:18 +02:00
TheBusyBiscuit	edade50abf	Fixed infinite Diet Cookie Glitch	2019-08-30 01:26:16 +02:00
TheBusyBiscuit	6c18d368a1	Fixed Typo	2019-08-30 01:19:54 +02:00
TheBusyBiscuit	f8ad7bd13c	Hotfix	2019-08-30 01:15:21 +02:00
TheBusyBiscuit	7fe97e6813	Merge pull request #1062 from LinoxGH/master ... Adding the Diet Cookie.	2019-08-30 01:11:56 +02:00
TheBusyBiscuit	07271edc47	Reduced technical debt	2019-08-30 01:11:33 +02:00
LinoxGH	6c6b6326a7	Did the requested changes.	2019-08-30 02:01:43 +03:00
TheBusyBiscuit	a83266104e	More Refactoring	2019-08-30 00:43:17 +02:00
TheBusyBiscuit	69d3990c64	Merge pull request #1060 from Sfiguz7/master ... Bigger code cleaning	2019-08-30 00:25:41 +02:00
ajan-12	2de2ac519d	Fixing Diet Cookie not being consumed.	2019-08-30 01:24:22 +03:00
ajan-12	30d3dfe038	Adding Diet Cookie. ... - A Cookie made by an elytra scale and a cookie! - Levitates the player for 3 seconds.	2019-08-30 01:12:02 +03:00
Sfiguz7	c11eb54037	Cleaning	2019-08-29 23:18:04 +02:00
Sfiguz7	7c6d722283	Cleaned constructors' diamond operators	2019-08-29 22:52:46 +02:00
Sfiguz7	85ee828abf	Separated variable declaration	2019-08-29 22:46:03 +02:00
TheBusyBiscuit	ad5271e9a4	Fixes #1059	2019-08-29 22:27:46 +02:00
TheBusyBiscuit	63c3ddcd99	Merge pull request #1057 from LinoxGH/master ... Adding Explosive Shovel and beautifying Tech Category.	2019-08-29 22:14:03 +02:00
Sfiguz7	f86e362e2f	Bigger code cleaning	2019-08-29 22:04:31 +02:00
ajan-12	4b60ddf8e7	Fixing the placeholder method.	2019-08-29 22:24:52 +03:00
ajan-12	388ca2decd	Renaming "Maximum Explosivity" to "Explosive Tools".	2019-08-29 22:24:19 +03:00
TheBusyBiscuit	cc034588f4	Merge pull request #1055 from Sfiguz7/master ... Code cleaning	2019-08-29 20:35:58 +02:00
TheBusyBiscuit	37383169c1	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2019-08-29 20:31:15 +02:00
TheBusyBiscuit	0868f47fc4	Fixed Smeltery Fire-Breaking chance not loading	2019-08-29 20:30:58 +02:00
Sfiguz7	c23b0e438b	Code cleaning	2019-08-29 19:12:53 +02:00
ajan-12	f38323a2b4	Moved the Hologram Projector location for guide to look better.	2019-08-29 20:00:26 +03:00
ajan-12	ac7d1608e6	Adding Explosive Shovel. ... - Renamed the Research "Explosive Pickaxe" to "Maximum Explosivity" and added Explosive Shovel to it. - Added a new recipe to Magic Workbench for Explosive Shovel. - Explosive Shovel is made by 1 Ferrosilicon, 1 TNT and 1 Synthetic Diamond. - Made the Explosive Shovel so that it can only break dirt-like, sand and its variations, gravel, clay and snow blocks. - This adds the shovel the benefit of fast landscaping but still adds a reason to use Explosive Pickaxe.	2019-08-29 19:36:16 +03:00
TheBusyBiscuit	b6b914f03e	Merge pull request #1054 from LinoxGH/master ... Adding Auto Drier and optimizing imports for SlimefunSetup.java	2019-08-29 16:41:23 +02:00
LinoxGH	12fa69ac42	Changing the progress bar and removing redundant checks. ... Implementing the changes requested in the PR to original Slimefun4 repo.	2019-08-29 17:30:30 +03:00
TheBusyBiscuit	bbf0bfd006	Refactoring	2019-08-29 16:19:23 +02:00
LinoxGH	6f09eaa1e4	Fixing the auto drier using multiple inputs.	2019-08-29 17:16:39 +03:00
LinoxGH	4e152ca180	Adding the file of the Auto Drier machine itself.	2019-08-29 16:56:18 +03:00
ajan-12	8188c1986c	Adding a new electric machine Auto Drier. ... - Made in Enhanced Crafting Table with 2 heating coils, 1 smoker and 1 campfire. - Dries items. - Removes the water from water bucket. - Removes the liquids in potions. - Produces sticks from leaves and saplings. - Dries wet sponges to sponges. - Produces leathers from rotten flesh	2019-08-29 16:53:08 +03:00
TheBusyBiscuit	388873d6a2	Reduced technical debt	2019-08-29 15:13:40 +02:00
TheBusyBiscuit	ee30e8b73d	Fixed StackOverflow	2019-08-29 13:59:33 +02:00
TheBusyBiscuit	405e2f651b	Finalized #1053	2019-08-29 11:05:58 +02:00
TheBusyBiscuit	99cd14fa5f	Added "legacy-ore-grinder" config option for old Ore Grinder Behaviour.	2019-08-29 10:26:36 +02:00
Sfiguz7	d6aff405ca	Reduced technical debt	2019-08-28 23:47:25 +02:00
TheBusyBiscuit	e0316453d9	Reduced technical debt	2019-08-28 10:59:20 +02:00
TheBusyBiscuit	dc1cff31f5	Connected Interfaces to abstract classes	2019-08-28 00:48:39 +02:00
TheBusyBiscuit	1b3c0fcdc2	Fixed more stupid backwards compatibility	2019-08-28 00:43:18 +02:00
TheBusyBiscuit	9982292e80	Final fix	2019-08-28 00:09:23 +02:00
TheBusyBiscuit	33266c7c88	Fixed even more Issues	2019-08-27 23:48:41 +02:00
TheBusyBiscuit	2b09ca5e61	Stupid backwards compatibility	2019-08-27 23:24:43 +02:00
TheBusyBiscuit	4875ce1241	Revert "Removed deprecated junk" ... This reverts commit cc3c026b1c.	2019-08-27 23:18:58 +02:00
TheBusyBiscuit	cc3c026b1c	Removed deprecated junk	2019-08-27 23:14:10 +02:00
TheBusyBiscuit	3ccf0722b6	Reduced technical debt again	2019-08-27 23:08:13 +02:00
TheBusyBiscuit	204e61d3a5	Fixes #1049 again	2019-08-27 22:32:26 +02:00
TheBusyBiscuit	87ff5fdbc2	Pushing missing files	2019-08-27 21:46:50 +02:00
TheBusyBiscuit	31c7c50f64	Fixes #1049	2019-08-27 21:43:43 +02:00
TheBusyBiscuit	aff264d66c	More Refactoring + Code Cleanup (Reduced cognitive load)	2019-08-27 20:37:33 +02:00
TheBusyBiscuit	3d3f1b6c87	Fixed Ignition Chamber Bug	2019-08-27 17:55:20 +02:00
TheBusyBiscuit	04444fc298	This File gets a Refactoring, ... that File gets a Refactoring, everybody gets a Refactoring!	2019-08-27 16:26:35 +02:00
TheBusyBiscuit	f4be2a8d5b	Fixes #708	2019-08-27 15:35:56 +02:00
TheBusyBiscuit	77a8911b8c	Another large wave of refactoring and technical debt reduction	2019-08-27 15:27:38 +02:00
TheBusyBiscuit	641a2e6e30	A LOT more Refactoring + Technical debt reduction	2019-08-27 14:08:09 +02:00
TheBusyBiscuit	fd36288efb	More Refactoring	2019-08-27 13:28:07 +02:00
TheBusyBiscuit	65af683a8a	Resolves #247	2019-08-27 13:09:30 +02:00
dNiym	07234cf246	Made requested changes.	2019-08-26 18:12:08 -04:00
dNiym	2b680ec88e	Undid un-needed brackets {}	2019-08-26 18:08:08 -04:00
dNiym	33b09ef63d	Fixes disabled items in worlds #735	2019-08-26 18:05:19 -04:00
TheBusyBiscuit	0ae0768c29	Fixes #1043	2019-08-26 22:01:40 +02:00
TheBusyBiscuit	7aff9a7fe4	Fixes #1042	2019-08-26 19:13:56 +02:00
TheBusyBiscuit	65975ae094	Refactored Code	2019-08-26 09:07:02 +02:00
TheBusyBiscuit	c08674d8c7	Fixes #1040	2019-08-26 09:04:25 +02:00
TheBusyBiscuit	effca277ba	Merge pull request #1039 from dniym/ElectricFurnace ... Fix electric furnaces not being able to use logs.	2019-08-25 23:30:56 +02:00
dNiym	1859aef846	Fix electric furnaces not being able to use logs.	2019-08-25 17:24:51 -04:00
TheBusyBiscuit	9ac8fca7f4	Added Placeholders	2019-08-25 23:20:31 +02:00
TheBusyBiscuit	cbb1143456	Forgot to push this file	2019-08-25 23:14:06 +02:00
TheBusyBiscuit	ce3055a069	Fixed Infused Magnet working in Spectator Mode	2019-08-25 22:57:41 +02:00
TheBusyBiscuit	cdb43b15ee	Added PlayerProfile#getTitle()	2019-08-25 22:39:59 +02:00
TheBusyBiscuit	8b55a4cd26	More Refactoring	2019-08-25 22:21:06 +02:00
TheBusyBiscuit	a1193781cb	Reduced technical debt	2019-08-25 22:09:27 +02:00
TheBusyBiscuit	0925be3427	Deprecations	2019-08-25 22:01:22 +02:00
TheBusyBiscuit	d99c9ea584	First steps towards PlaceholderAPI hook	2019-08-25 21:41:47 +02:00
TheBusyBiscuit	79c1120ae8	Refactoring, Bug Fix and Cleanup	2019-08-25 20:52:38 +02:00
TheBusyBiscuit	f3c3552e9c	Fixes #1036	2019-08-25 20:23:06 +02:00
TheBusyBiscuit	b10db8c728	Improved error-reports diagnostics	2019-08-25 18:06:36 +02:00
TheBusyBiscuit	2a3b446d15	Improved Backpacks Performance	2019-08-25 17:35:19 +02:00
TheBusyBiscuit	d589002430	Added Research-Caching (May improve Performance a lot)	2019-08-25 16:07:06 +02:00
TheBusyBiscuit	0fad51e263	Fixes #1034	2019-08-24 20:27:25 +02:00
dNiym	b82d9571b7	Fix busted spawners	2019-08-24 00:26:37 -04:00
TheBusyBiscuit	db1e69a94b	Fixed Talisman of the Anvil (Fixes #800)	2019-08-23 21:15:47 +02:00
TheBusyBiscuit	6575e1c538	Merge pull request #1029 from dniym/SpawnerFix ... Fix broken spawner error	2019-08-23 09:07:55 +02:00
dNiym	da8def9d4f	Fix broken spawner error	2019-08-23 01:29:51 -04:00
TheBusyBiscuit	6de21b553b	Merge pull request #1026 from dniym/ReactorAccessFix3 ... Fixed Reactor Access Port being unable to be opened	2019-08-22 21:51:56 +02:00
TheBusyBiscuit	26efc7ad1e	Fixes #1020	2019-08-22 21:37:09 +02:00
dNiym	17f65e26c7	Removed BlockStorageTag that was not needed.	2019-08-22 12:20:19 -04:00
TheBusyBiscuit	c7ce480a5b	Removed redundant line	2019-08-22 14:56:05 +02:00
TheBusyBiscuit	8527828c70	Merge pull request #1028 from dniym/DroidFix2 ... Droid fix2	2019-08-22 14:55:31 +02:00
dniym	6766284f11	Fix Unbreakable Androids ... Fixes #997	2019-08-21 22:08:54 -04:00
dNiym	deb904f338	adsf	2019-08-21 22:05:38 -04:00
dNiym	778431c306	Fix androids being unbreakable	2019-08-21 22:04:10 -04:00
dNiym	5c68c07cca	typo fix	2019-08-21 21:52:36 -04:00
dNiym	2aeefab235	Fix energy regulators when exploded	2019-08-21 21:50:32 -04:00
dNiym	b5475f3d3c	Made Requested Changes	2019-08-21 21:43:12 -04:00
NihilistBrew	ce1e3fb07c	Fix indents	2019-08-19 20:24:08 +02:00
NihilistBrew	4fd996e2fc	Add double-chest backpack (Radiant Backpack)	2019-08-19 20:15:25 +02:00
TheBusyBiscuit	bfba42c3f3	Merge pull request #1016 from dniym/Backpack-Fix-948 ... Backpack fix 948	2019-08-19 09:53:07 +02:00
TheBusyBiscuit	36377c5777	Merge pull request #1014 from dniym/TableSaw2 ... Table Saw Bug #1003 fix	2019-08-19 09:45:39 +02:00
TheBusyBiscuit	0a840ccea9	Merge pull request #995 from dniym/ReactorFix ... Reactor fix	2019-08-19 09:31:06 +02:00
TheBusyBiscuit	480ee72e08	Fixes #1009	2019-08-19 09:17:40 +02:00
dniym	1625220b7f	Fix issue #948 ... Fixes issue #948	2019-08-19 01:00:55 -04:00
dNiym	24e9652857	fix Item Duplication Bug #1003 ... This fix currently prevents stripped_ logs from being used at all in the table saw as the MaterialHelper.java in CS-Core lib needs to be updated to allow the wood type to be properly detected from the material name. Update submitted in cs-corelib -> https://github.com/TheBusyBiscuit/CS-CoreLib/pull/109	2019-08-19 00:18:09 -04:00
dNiym	2418764806	Use a variable to compare reactor id types.	2019-08-18 23:43:22 -04:00
dNiym	aeacac0b01	Updated with requested changes	2019-08-18 14:47:25 -04:00
AlexLander123	7defa9ccba	Fixes ChestedHorse Duplication Bug	2019-08-09 21:29:57 +08:00
dNiym	8a56939931	Made Requested Changes	2019-08-05 09:44:40 -04:00
dNiym	bac456da25	REACTOR/PORT UPDATE ... Update Reactor and Reactor Access Port to be a bit easier to use, now when a reactor detects an attached access port the GUI will be updated to show the two are linked. Once linked the reactor access port will show the status of the actual reactor rather than it's own inventory, allowing users to remotely control the reactor's priority and see the remaining fuel/coolant. Items can still be added to the access port manually or sent in from the cargo manager.	2019-08-05 01:15:12 -04:00
TheBusyBiscuit	f54fd125c3	Merge pull request #992 from BluGhostYT/master ... Duplication glitch fix for ChestTerminals & Androids	2019-08-04 16:48:43 +02:00
HSGamer	8a6cecf7bd	SMELTERS_PICKAXE: return true	2019-08-04 21:26:27 +07:00
CyberPatriot	b322e3a207	Update ProgrammableAndroid.java	2019-08-04 09:20:05 -05:00
HSGamer	79e9839c6e	SMELTERS_PICKAXE: use hasBlockInfo	2019-08-04 14:46:51 +07:00
CyberPatriot	86a1960ffd	Fix #2 ... So apparently I am a moron and didn't think about making the entire code for it mining all SF items ignored. Courtesy to dNiym for pointing this out.	2019-08-04 00:47:43 -05:00
HSGamer	e00984816f	SMELTERS_PICKAXE: ignore Slimefun block	2019-08-04 08:44:05 +07:00
HSGamer	5746285881	EXPLOSIVE_PICKAXE: ignore liquid block	2019-08-04 08:38:58 +07:00
CyberPatriot	657b0e167b	Implement Miner Android fix	2019-08-03 17:42:27 -05:00
CyberPatriot	13e0e02dc1	Implement fix for ChestTerminals ... Recently, there was a duplication glitch with Chest Terminals with androids that I had posted. This fix fixes that glitch and prevents androids from mining player heads altogether.	2019-08-03 16:24:34 -05:00
TheBusyBiscuit	80aecd2711	Merge pull request #989 from NihilistBrew/spawnerdupe ... Fix spawner dupe and objectified e.getBock()	2019-08-03 20:33:41 +02:00
NihilistBrew	b6a4322de6	Fix PR: Remove block storage clear	2019-08-03 20:16:19 +02:00
TheBusyBiscuit	eec510d32f	Merge pull request #979 from dniym/TableSaw ... Table saw	2019-08-03 20:06:05 +02:00
TheBusyBiscuit	98bfa98701	Merge pull request #988 from dniym/AltarExploitFix ... Fix Altar Item Swap Exploit	2019-08-03 19:53:33 +02:00
dNiym	e62a3d8509	Combined research for Table_Saw and Saw_Mill	2019-08-03 13:51:34 -04:00
dNiym	969fbf01a7	Added Requested Changes	2019-08-03 13:47:36 -04:00
dNiym	751cc88321	Re-Added SAW_MILL to research	2019-08-03 13:44:42 -04:00
TheBusyBiscuit	c46d120df8	Merge pull request #991 from dniym/CargoNodeBugFix ... Fix issue #966 (Trying again)	2019-08-03 19:37:34 +02:00
dNiym	640915d85a	Fix issue #966 (Trying again)	2019-08-03 13:27:46 -04:00
TheBusyBiscuit	233c61e1d6	Merge pull request #990 from dniym/BioReactorFuelUpdate ... Adding new 1.14 materials to BioReactor	2019-08-03 19:27:24 +02:00
dNiym	4d326f5228	Fixing revert, no idea how that happened.	2019-08-03 13:19:10 -04:00
dNiym	bcbeafba53	made requested changes	2019-08-03 13:05:23 -04:00
NihilistBrew	8af503aceb	Fix spawner dupe and objectified e.getBock()	2019-08-03 18:59:47 +02:00
dNiym	1f3f2c635d	Fix Altar Item Swap Exploit	2019-08-03 12:54:45 -04:00
TheBusyBiscuit	862c14c403	Merge branch 'master' into master	2019-08-03 18:08:51 +02:00
TheBusyBiscuit	9afba9fa78	Merge pull request #984 from NihilistBrew/changetowire ... Add copper wire	2019-08-03 17:54:37 +02:00
NihilistBrew	50d74ced10	Fixed indents	2019-08-03 17:52:10 +02:00
NihilistBrew	8c8996368b	fix PR	2019-08-03 17:39:41 +02:00
NihilistBrew	460c082a51	Fixed research indent #2	2019-08-03 17:03:54 +02:00
NihilistBrew	5eaf3949b7	Fixed research indent	2019-08-03 17:02:32 +02:00
NihilistBrew	6af9307fe1	Accidentally edited a LOC	2019-08-02 15:04:22 +02:00
NihilistBrew	09b961ad1d	Added sandstone to grind stone	2019-08-02 14:55:07 +02:00
NihilistBrew	78cea97fff	Add copper wires	2019-08-02 13:20:28 +02:00
NihilistBrew	00d376e213	Update SlimefunMachine.java	2019-08-01 12:03:08 +02:00
NihilistBrew	b9d8e8f5dd	Update config.yml	2019-08-01 11:17:47 +02:00
NihilistBrew	60064a0fe1	Added OUTPUT_CHEST functionality ... S	2019-08-01 11:01:43 +02:00
dniym	1386849d7d	Replace Saw_Mill with Table_Saw machine ... Replaced saw_mill machine with new table_saw machine in the research, to allow players who previously unlocked the saw_mill to craft it's replacement.	2019-07-30 12:53:03 -04:00
dniym	6db2e48e64	Add Table_Saw to the SlimeFunItems List	2019-07-30 12:50:36 -04:00
dniym	bd4732281b	Set SAW_MILL to be hidden in the slimefun guide	2019-07-30 12:49:04 -04:00
dniym	d0fa9a53fd	Added a new basic machine to replace the Saw Mill ... Sawmill was obsolete and could not be easily reworked to allow for new minecraft logs.	2019-07-30 12:43:17 -04:00
TheBusyBiscuit	bf61b4a42f	Added GitHubBuilds-Updater for development-builds	2019-07-17 14:57:52 +02:00
Nathan Adhitya	e1190a5d1e	Update ItemListener.java	2019-07-08 17:07:38 +07:00
SoSeDiK	839c263955	Replace SimpleJSON with Gson	2019-06-23 23:03:20 +03:00
CyberPatriot	f9ee475dca	Push	2019-06-20 18:12:23 -05:00
CyberPatriot	ebd1275f89	Change boolean allow = true to false ... The reason for this is because it solves a duplication glitch.	2019-06-20 17:50:03 -05:00
TheBusyBiscuit	2812b84ea8	Minor Code Optimizations	2019-06-20 10:12:34 +02:00
TheBusyBiscuit	7c011d916a	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2019-06-20 09:51:15 +02:00
TheBusyBiscuit	1fd0b40f9f	Removed URID	2019-06-20 09:50:59 +02:00
TheBusyBiscuit	5656a0564f	Update AncientAltarListener.java	2019-06-19 22:33:47 +02:00
TheBusyBiscuit	0a5c9e901e	Fixed Ancient Altar Items	2019-06-19 22:32:09 +02:00
CyberPatriot	2f301be679	Update ReactorHologram.java	2019-06-19 09:26:30 -05:00
CyberPatriot	3e6767cfb3	Update EnergyHologram.java	2019-06-19 08:32:33 -05:00
CyberPatriot	569f9bb329	Fix holograms for Cargo and energy	2019-06-19 08:32:18 -05:00
TheBusyBiscuit	4946d428ad	Fixed Item Recognition System	2019-06-19 08:46:43 +02:00
TheBusyBiscuit	27cb4c389c	Fixed Ancient Altar Recipes for good	2019-06-18 17:39:59 +02:00
TheBusyBiscuit	b2420b8271	Fixed Ancient Altar Recipes	2019-06-18 15:35:16 +02:00
TheBusyBiscuit	b333cfd7a5	Improved Ancient Altar Recipe Recognition System	2019-06-18 14:55:52 +02:00
Bas Verhoeven	eba6fb041f	Drop Slimefun items when broken by another Slimefun tool ... When a Slimefun item that doesn't have a BlockHandler is broken by a tool that does have a BlockHandler and that tool's BlockHandler returns true, Slimefun would stop handling the "onBlockBreak" event and would not drop the Slimefun item that was broken but some vanilla block instead. This commit attempts to fix the way those events are handled, ensuring that if a Slimefun item is broken one is dropped for the player.	2019-06-13 21:18:43 +02:00
CyberPatriot	877e01b1be	Fix for issue #879 ... This edit is for issue #879 . Tested on latest versions of Slimefun, ChestTerminal, and CS-CoreLib. 1.13 is to be determined.	2019-06-12 23:48:38 -05:00
TheBusyBiscuit	78cbc990f4	Fixes #912	2019-06-11 13:27:24 +02:00
TheBusyBiscuit	1c600efee3	Possibly fixes #822	2019-06-11 12:45:50 +02:00
Steve	3900cb7aff	Update ItemListener.java	2019-06-10 22:32:31 +04:00
Bas Verhoeven	7b2a869abe	Damage explosive pickaxe on use (configurable, off by default) ... The Explosive Pickaxe currently doesn't take any damage and therefore doesn't lose durability, which isn't a desirable behavior for some of us. This commit adds a 'damage-on-use' item setting for EXPLOSIVE_PICKAXE, which is disabled by default. When enabled, the Explosive Pickaxe will get damaged for each block it breaks, in the same way a normal Diamond Pickaxe would get damage if it were to break those blocks. This seems to be similar to how Slimefun damages other tools. Players can still enable Unbreaking (e.g. durability) on the pickaxe.	2019-05-30 21:07:36 +02:00
Bas Verhoeven	0af6ec13d6	Do not allow more than 54 items in reactor/generator setup guide slots ... If we don't, opening the schematics for a Bio Reactor results in "IllegalArgumentException: Size for custom inventory must be a multiple of 9 between 9 and 54 slots" And the player is simply handed the Bio Reactor, which they can place and use. Once they do that, the Slimefun guide can't be used until they reconnect. For generators and reactors we show the fuels underneath the schematics or build instructions. When there are more fuels than available space to show them, we'll overflow, causing the custom inventory to not work and Slimefun throwing exceptions.	2019-05-30 20:08:35 +02:00
TheBusyBiscuit	3010e93675	Fixes #895	2019-05-30 13:50:20 +02:00
TheBusyBiscuit	11fec71a94	Made Credits load asynchronously	2019-05-30 13:42:06 +02:00
TheBusyBiscuit	ee4490c240	Fixes #839	2019-05-30 12:08:14 +02:00
freethemice	5ffb1a5170	unclosed character literal ... fixes "unclosed character literal" error some people may get on compile.	2019-05-28 17:19:15 -05:00
Kry-Vosa	59a0811445	Fix for #913 ... Ported fix from #804	2019-05-24 14:51:49 +02:00
Kry-Vosa	d9015cbbf3	Fix for #915 ... setCustomName removes unnecesary ChatColor codes (e.g. &r that doesn't reset anything). Saving the true CustomName in BlockStorage resolves the issue.	2019-05-22 18:14:32 +02:00
sarhatabaot	f30c630bee	Update JetBootsTask.java	2019-05-04 22:34:25 +03:00
sarhatabaot	1470ad598a	Implemented SlimefunTask in Tasks ... * Implemented SlimefunTask in Tasks. * This removes the duplication in the code.	2019-05-04 22:31:26 +03:00
sarhatabaot	6b5b55f988	Changed access levels to enable inheritation of variables ... Changed access levels to enable inheritation of variables in sub classes.	2019-05-04 22:30:33 +03:00
sarhatabaot	3c651dcccb	Update SlimefunTask.java	2019-05-04 22:20:42 +03:00
sarhatabaot	2262222f60	Revert "Revert "Implemeted abstract Task class"" ... This reverts commit 74b89b9380.	2019-05-04 22:19:12 +03:00
sarhatabaot	74b89b9380	Revert "Implemeted abstract Task class" ... This reverts commit 82b3f3c06c.	2019-05-04 22:18:53 +03:00
sarhatabaot	82b3f3c06c	Implemeted abstract Task class ... * Removes the duplicated code in every Task class.	2019-05-04 22:18:28 +03:00
sarhatabaot	b20851da07	Encapsulated variables	2019-05-04 22:16:20 +03:00
sarhatabaot	f6312a9bd9	Encapsulated variables	2019-05-04 22:07:56 +03:00
sarhatabaot	4e32c4981c	Extracted dupliocted code blocks to methods	2019-05-04 22:04:03 +03:00
sarhatabaot	a622e05ea8	Refactored Talisman ... Refactored the class for better readability. * Added getPlayerByEventType method, instead of calling it directly from checkFor(). * Added pass method. * Checking for false results first to reduce the amount of if-else. * Renamed SlimefunItem talisman -> SlimefunItem item. * Created new Talisman talisman = (Talisman) item, after instanceof check. * Note: Casting the item every time to talisman clutters the code.	2019-05-04 11:06:01 +03:00
sarhatabaot	833ce0108a	Replaced iteration with addAll() ... * Iteration replaced with call Collection.addAll * Encapsulated variables	2019-05-04 10:25:54 +03:00
TheBusyBiscuit	3feff223bc	Merge pull request #902 from WalshyDev/patch/mc_1_14 ... SF 4.1.17 - MC v1.14	2019-04-29 20:02:20 +02:00
Omer Oreg	364a7944a6	Minor codecleanup & fixed spelling mistake ... * Specifying the type in the diamond operator is not necessary in from java 7 * Spelling mistake: convertable -> convertible * Encapsulated the item & machine variables. * Changed the constructor as Slimefunitem item is not used anywhere except in the constructor.	2019-04-29 14:12:55 +03:00
WalshyDev	733f401ff6	SF 4.1.17 - MC v1.14	2019-04-28 16:22:30 +01:00
TheBusyBiscuit	f1512ffeea	Merge pull request #900 from sarhatabaot/patch-1 ... Return efficiency when getFuelEfficiency is called	2019-04-20 10:16:24 +02:00
Omer Oreg	08538ad876	Return efficiency when getFuelEfficiency is called ... Return efficiency when getFuelEfficiency is called instead of speed.	2019-04-19 18:09:55 +03:00
jellysnake	0d65da0dd7	Fix miners not having the correct range	2019-04-19 01:07:35 +10:00
SoSeDiK	4fed304381	Fix for #888	2019-04-13 13:47:22 +03:00
SoSeDiK	4710fd809e	Fix for SoulJars' spawner recipes not being displayed properly	2019-04-11 16:10:23 +03:00