2006 Commits

Author	SHA1	Message	Date
TheBusyBiscuit	5b86ef1e7e	Merge pull request #1339 from mohkamfer/AutomatedCraftingChamberCraftLast ... Enable Automated Crafting Chamber To Craft Last Shaped Recipe	2020-01-03 14:42:57 +01:00
TheBusyBiscuit	89d55430fb	Radioactive items have a new lore!	2020-01-03 14:41:15 +01:00
TheBusyBiscuit	1b0d507783	Updated Radioactive - lore. You may need to convert some items...	2020-01-03 13:57:56 +01:00
Muhammad Kamal	667ec595ee	Refactor getSerializsedInput()'s if conditions	2020-01-03 14:52:34 +02:00
Muhammad Kamal	e8a79a7c3a	Refactor tick()'s if condition	2020-01-03 14:50:02 +02:00
TheBusyBiscuit	34a56a1bb6	Simplified some lore utilities	2020-01-03 13:33:21 +01:00
Muhammad Kamal	fc007273bb	Fix ItemStack Amounts Greater Than 1	2020-01-03 14:10:32 +02:00
Muhammad Kamal	9d246adf93	Reformat Code	2020-01-03 14:04:43 +02:00
TheBusyBiscuit	84604752e3	[CI skip] Little file size optimization I guess?	2020-01-03 02:20:36 +01:00
Muhammad Kamal	f8c2983491	Enable Automated Crafting Chamber To Craft Last Shaped Recipe	2020-01-01 00:02:47 +02:00
TheBusyBiscuit	3773460561	Fixes #1337	2019-12-30 01:25:05 +01:00
TheBusyBiscuit	e90b8c18f7	[CI skip] Reduced technical debt	2019-12-30 01:21:47 +01:00
TheBusyBiscuit	b74479327a	[CI skip] Reduced technical debt	2019-12-30 01:18:09 +01:00
TheBusyBiscuit	1c0e36f6f1	[CI skip] Optimized and refactored some android code	2019-12-30 01:01:09 +01:00
TheBusyBiscuit	a817903a04	[CI skip] Updated dependencies	2019-12-29 22:13:00 +01:00
TheBusyBiscuit	b8a94e22e5	[CI skip] Some refactoring	2019-12-29 18:30:48 +01:00
TheBusyBiscuit	e2d58f7f50	Several changes, won't list em all	2019-12-29 14:14:51 +01:00
TheBusyBiscuit	8db990f56c	[CI skip] Fixed pages for main menu	2019-12-29 00:05:30 +01:00
TheBusyBiscuit	39292ae9ce	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2019-12-28 12:43:01 +01:00
TheBusyBiscuit	784ad0b195	Fixes #1295	2019-12-28 12:42:39 +01:00
AlexLander123	586437b16d	Fix Basic Circuit Board not dropping	2019-12-28 14:35:39 +08:00
TheBusyBiscuit	8b3d1fedcb	[CI skip] Minor tweaks	2019-12-27 16:43:23 +01:00
TheBusyBiscuit	9a3d79781b	[CI skip] Reduced technical debt	2019-12-27 11:38:54 +01:00
TheBusyBiscuit	687e97f8e9	Minecraft recipe will now scroll through all available items (e.g. wood)	2019-12-27 11:10:22 +01:00
TheBusyBiscuit	2a06c2e215	Slimefun Guide now shows ALL minecraft recipes, with pages	2019-12-27 02:16:01 +01:00
TheBusyBiscuit	5dc19aedc3	[CI skip] Excluded github-actions from the contributors list	2019-12-26 23:30:28 +01:00
TheBusyBiscuit	3a19350323	Added Kelp Cookies (because why not?)	2019-12-26 21:26:04 +01:00
TheBusyBiscuit	336b26759a	[CI skip] Some minor changes	2019-12-26 21:10:03 +01:00
TheBusyBiscuit	f7bfff2f37	Players can now toggle their research-fireworks in the guide	2019-12-26 21:01:51 +01:00
TheBusyBiscuit	d2ac50be38	Overhauled Guide Settings	2019-12-26 20:52:15 +01:00
TheBusyBiscuit	b7776e73b4	Minor performance improvement	2019-12-26 20:29:20 +01:00
TheBusyBiscuit	4efb53b705	Minor changes	2019-12-26 20:22:28 +01:00
TheBusyBiscuit	5933bc6367	Reduced technical debt	2019-12-26 19:56:58 +01:00
TheBusyBiscuit	249af4001b	Fixes #1325	2019-12-26 19:49:53 +01:00
TheBusyBiscuit	7183350e1a	Some code cleanup	2019-12-26 18:36:21 +01:00
TheBusyBiscuit	0efc51c7ea	Fixed Category constructor	2019-12-26 18:30:40 +01:00
TheBusyBiscuit	129b98dff6	Lots of refactoring, implemented a suggestion	2019-12-23 20:38:55 +01:00
TheBusyBiscuit	bd610a9f94	Fixes #1298	2019-12-23 19:39:35 +01:00
TheBusyBiscuit	0e0859e73a	[CI skip] Another minecraft alias	2019-12-23 00:39:03 +01:00
TheBusyBiscuit	2edf5db140	[CI skip] Added bverhoevens and BurningBrimstones minecraft alias	2019-12-22 23:51:43 +01:00
TheBusyBiscuit	b5dd2f329a	[CI skip] Reduced technical debt, lots of refactoring	2019-12-22 23:00:05 +01:00
TheBusyBiscuit	5a0b994a4f	Fixes #1318	2019-12-22 14:03:52 +01:00
TheBusyBiscuit	997c682a00	Refactoring + Allowed custom models for UI elements	2019-12-22 14:00:35 +01:00
coco0325	2ceb9d6d45	Update OilPump.java	2019-12-22 17:08:44 +08:00
coco0325	4d63bffc72	Update OilPump.java	2019-12-22 15:31:53 +08:00
coco0325	87b8035b34	Corrected OliPump.java	2019-12-22 01:46:56 +08:00
coco0325	ff0016ad0e	Update OilPump.java	2019-12-22 01:32:20 +08:00
coco0325	2fd2dae403	Revert "TW-1" ... This reverts commit 687516cfae.	2019-12-22 01:18:12 +08:00
coco0325	7d0d222f79	Update OilPump.java	2019-12-22 01:16:43 +08:00
coco0325	060051623d	Merge remote-tracking branch 'upstream/master'	2019-12-22 01:08:49 +08:00
coco0325	687516cfae	TW-1	2019-12-22 01:07:58 +08:00
TheBusyBiscuit	bee2375757	Removed Nether Drill (+ some micro-optimizations)	2019-12-21 16:46:17 +01:00
TheBusyBiscuit	c1ba8c02b3	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2019-12-21 15:42:29 +01:00
TheBusyBiscuit	429c280095	Fixes #1316	2019-12-21 15:42:07 +01:00
TheBusyBiscuit	6ef858a6ee	[CI skip] Merge pull request #1312 from pentabulge/master ... Added more wiki entries	2019-12-19 23:42:45 +01:00
TheBusyBiscuit	a89b9ff467	[CI skip] Fine, I'll do it myself, Thanos said	2019-12-19 23:26:40 +01:00
TheBusyBiscuit	97d72e0a8d	[CI skip] Merge pull request #1294 from BurningBrimstone/master ... Added recipes	2019-12-19 23:25:03 +01:00
TheBusyBiscuit	f9b12dfed5	[CI skip] Improved Cargo Performance a lot (breaks Barrels though)	2019-12-19 23:22:09 +01:00
penta	f9ef602982	Added more wiki entries	2019-12-18 19:40:03 +01:00
TheBusyBiscuit	f7fa6e2972	[CI skip] Reduced technical debt and tweaked Magnesium Salt	2019-12-18 01:07:04 +01:00
TheBusyBiscuit	331b9b64a7	[CI skip] Merge pull request #1310 from J3fftw1/feature/gravel-to-sand ... added a way to automate sand production	2019-12-17 23:08:19 +01:00
J3fftw1	b1ae5c9047	added a way to automate sand production	2019-12-17 23:03:56 +01:00
TheBusyBiscuit	33adb7e79a	Added Magnesium Salt and Magnesium-powered Generator	2019-12-17 01:37:09 +01:00
TheBusyBiscuit	59fb83e871	[CI skip] Removed CS-CoreLib Auto-Installer and reduced technical debt	2019-12-17 00:44:41 +01:00
TheBusyBiscuit	5730907da3	Merge pull request #1308 from creator3/master ... Fix drops in 1.15	2019-12-17 00:19:10 +01:00
TheBusyBiscuit	989ed45a02	Added Salt to the GEO Miner (and reduced technical debt)	2019-12-17 00:18:04 +01:00
creator3	d698840e1f	Use the actual tool item in calls to getDrops()	2019-12-16 11:47:47 -05:00
creator3	8b177df6c8	Fix drops in 1.15	2019-12-16 11:21:31 -05:00
penta	66b44f20df	Update wiki.json	2019-12-12 16:47:07 +01:00
penta	04a202d9a4	Added more wiki entries	2019-12-12 14:05:43 +01:00
TheBusyBiscuit	7268fb0505	[CI skip] Some more refactoring	2019-12-12 02:52:24 +01:00
TheBusyBiscuit	7cb0c521f6	[CI skip] Some refactoring	2019-12-12 01:45:55 +01:00
TheBusyBiscuit	aa9652cf88	Fixed Credits erroring for invalid usernames	2019-12-12 00:22:00 +01:00
TheBusyBiscuit	a91d926698	Re-formatted pom.xml	2019-12-12 00:20:01 +01:00
TheBusyBiscuit	db5f10ffe8	Fixed Credits + Reduced technical debt	2019-12-12 00:16:28 +01:00
TheBusyBiscuit	d66d34e85b	Merge branch 'master' into support/1.15	2019-12-11 23:15:33 +01:00
TheBusyBiscuit	3976e427a0	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2019-12-11 23:14:25 +01:00
TheBusyBiscuit	1ee411e4ca	[CI skip] Reduced and Increased technical debt	2019-12-11 23:13:51 +01:00
Daniel Walsh	32be167679	Support 1.15	2019-12-11 16:41:00 +00:00
BurningBrimstone	642f5fe464	Added Ore Block Recipes ... Added following recipes to the electric press: Diamond -> Diamond Block Redstone -> Redstone Block Lapis -> Lapis Block Gold -> Gold Block Iron -> Iron Block	2019-12-11 00:56:19 -05:00
TheBusyBiscuit	460270f2a9	Merge pull request #1292 from SoSeDiK/kt ... Reworked & Fixed Knowledge Tome and a minor researching tweak	2019-12-10 11:27:33 +01:00
TheBusyBiscuit	f74c078f61	Merge pull request #1293 from NihilistBrew/patch-1 ... Grind andesite, granite, diorite to gravel	2019-12-10 11:26:57 +01:00
TheBusyBiscuit	fd8a77dd79	Merge pull request #1288 from ramdon-person/patch-1 ... Added Soulbound Trident	2019-12-10 11:26:44 +01:00
TheBusyBiscuit	cdef18c8d7	[CI skip] Little improvement	2019-12-10 11:21:09 +01:00
TheBusyBiscuit	4c593760ba	[CI skip] Some minor changes to metrics	2019-12-10 11:10:53 +01:00
TheBusyBiscuit	c8cc7818b2	[CI skip] Added two more contributor names, some refactoring	2019-12-10 11:00:04 +01:00
SoSeDiK	ac80575d8f	Optimized item check	2019-12-10 09:55:56 +02:00
ramdon_person	052f80eeac	Update SlimefunSetup.java	2019-12-09 23:24:51 -08:00
BurningBrimstone	c879e5ebb7	Updated Quartz Namespace ID ... Changed NETHER_QUARTZ to QUARTZ.	2019-12-09 13:19:09 -05:00
BurningBrimstone	60f16ee4ac	Added recipes ... Added recipes for iron and gold nuggets into their respective ingots. Also added a recipe for quartz into quartz blocks. https://discordapp.com/channels/565557184348422174/627048923122499584/652563773793763343	2019-12-09 12:40:51 -05:00
NihilistBrew	3d8add777a	Grind andesite, granite, diorite to gravel ... From https://discordapp.com/channels/565557184348422174/565569155848208404/650406015246008339	2019-12-09 16:50:25 +01:00
TheBusyBiscuit	6c4c9cdc17	Some minor optimization	2019-12-09 09:52:49 +01:00
SoSeDiK	f0d04c75d8	Removed unnecessary action	2019-12-08 23:12:11 +02:00
SoSeDiK	27a8aa6236	Tweaked instant researching ... Don't start researching when it's instant, just throw fireworks & message about completion	2019-12-08 22:55:17 +02:00
SoSeDiK	ce5ca5146e	Reworked Knowledge Tome	2019-12-08 22:45:03 +02:00
SoSeDiK	912d2e9d7f	Fixed duplicate Grind Stone recipes	2019-12-08 17:44:02 +02:00
SoSeDiK	9b5bcfde44	Updated Crucible's mechanics	2019-12-08 15:24:22 +02:00
TheBusyBiscuit	ec44688459	Improved SlimefunItemStack#clone()	2019-12-08 13:09:15 +01:00
TheBusyBiscuit	8e72577974	Another optimization	2019-12-08 13:03:01 +01:00
TheBusyBiscuit	021bb3cbc8	Item optimizations	2019-12-08 12:59:55 +01:00
TheBusyBiscuit	39082938a8	Optimized items even further	2019-12-08 12:58:50 +01:00
TheBusyBiscuit	a22068b9ff	Optimized SlimefunManager.isItemSimilar	2019-12-08 12:58:05 +01:00
TheBusyBiscuit	4699d6b94d	[Ci skip] Another little change	2019-12-08 10:48:41 +01:00
TheBusyBiscuit	d12253c2f2	[Ci skip] Some small changes	2019-12-08 10:07:51 +01:00
TheBusyBiscuit	e5da69eb30	Merge pull request #1287 from WalshyDev/fix/contributors ... Allow for different GH and MC names + small improvements	2019-12-08 09:31:06 +01:00
ramdon_person	17cf8cecdc	Update ResearchSetup.java	2019-12-07 12:30:38 -08:00
ramdon_person	c48cf894d4	Update SlimefunSetup.java	2019-12-07 11:56:11 -08:00
coder4321	4b8c948ad6	Update SlimefunSetup.java	2019-12-07 10:11:16 -08:00
coder4321	2281393a8b	Update SlimefunSetup.java	2019-12-07 10:09:50 -08:00
Daniel Walsh	f1ee2bd092	Added @NihilistBrew	2019-12-07 12:59:56 +00:00
coder4321	05f2751d58	Added Soulbound Trident	2019-12-07 01:25:34 -08:00
TheBusyBiscuit	72916b3e4f	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2019-12-07 10:05:11 +01:00
TheBusyBiscuit	f25bf75d67	Added Nether Gold Pan to the Electric Gold Pan	2019-12-07 10:04:54 +01:00
coder4321	f90f1c609f	[CI skip] Updated Teleport Sounds and Fixed The “color codes are supported text” for elevators (#1283) ... * Update TeleportationSequence.java * Update TeleportationSequence.java * Update Elevator.java	2019-12-07 09:41:26 +01:00
Daniel Walsh	cafc78b3fe	Revert 5b9e9a4fb7	2019-12-06 21:47:18 +00:00
Daniel Walsh	5b9e9a4fb7	*screams internally*	2019-12-06 21:45:06 +00:00
Daniel Walsh	9156d478ef	Add ajan-12 and LinoxGH	2019-12-06 21:35:17 +00:00
Daniel Walsh	3f179f9eaa	oops, revert dis	2019-12-06 21:03:56 +00:00
Daniel Walsh	724c550204	Pasting is a true gem	2019-12-06 20:57:17 +00:00
Daniel Walsh	73a9eddf7f	Fixed up ... Now doesn't accept special chars and added imgbot	2019-12-06 20:56:03 +00:00
Daniel Walsh	a112e43b42	Allow for different GH and MC names + small improvements	2019-12-06 20:08:20 +00:00
TheBusyBiscuit	a29016a391	[CI skip] Added more wiki entries	2019-12-06 14:41:01 +01:00
TheBusyBiscuit	bcbe16253e	Search now shows the Category of an Item	2019-12-06 14:20:42 +01:00
TheBusyBiscuit	43033ec3a4	Fixes #1280	2019-12-06 08:39:43 +01:00
SoSeDiK	a294e0db1f	Fixes #1281	2019-12-04 17:57:38 +02:00
SoSeDiK	732ae5e0dc	Added a new constructor ... Allows using the new item system.	2019-12-04 13:35:08 +02:00
TheBusyBiscuit	da1dd294f6	Fixed Output Chest	2019-12-04 00:04:34 +01:00
TheBusyBiscuit	0fd7892ca4	Fixed blocks turning into CSCoreLib heads for all newly placed ... non-ticking blocks.	2019-12-03 20:20:33 +01:00
TheBusyBiscuit	ae2a75b1d1	[CI skip] Merge pull request #1263 from poma123/patch-1 ... AndroidMineEvent	2019-12-03 00:37:23 +01:00
J3fftw1	c2230f1763	fixes dupe with geominer	2019-12-02 23:14:22 +01:00
poma123	1ddd46768e	Changed android getter & updated javadocs	2019-12-02 16:21:55 +01:00
J3fftw1	5e52a5d3ab	actually fixes it now ... removed if (list.size() % 2 != 0) list.add(null);	2019-12-02 15:58:33 +01:00
poma123	426dd64a2b	Added android getter and some javadocs	2019-12-02 15:15:48 +01:00
TheBusyBiscuit	8183a1a5af	Fixes #1269	2019-12-01 20:55:46 +01:00
TheBusyBiscuit	958a3c0429	Fixed IllegalArgumentException for second-page credits	2019-12-01 19:22:23 +01:00
TheBusyBiscuit	2c64adc536	[CI skip] Minor UI change	2019-12-01 19:18:02 +01:00
TheBusyBiscuit	4ffc2888fd	Fixed credits now showing everyone	2019-12-01 19:16:27 +01:00
TheBusyBiscuit	78df2e3ea5	Added Electric Press	2019-12-01 19:08:32 +01:00
TheBusyBiscuit	15d1d708f6	Fixed guide showing incomplete recipes for some machines	2019-12-01 18:59:14 +01:00
TheBusyBiscuit	20cdda2845	Fixed multi tools again	2019-12-01 18:42:33 +01:00
TheBusyBiscuit	3a608cfe4f	Fixed multi tools	2019-12-01 18:39:37 +01:00
TheBusyBiscuit	accb018b22	Reduced a bit more technical debt	2019-12-01 18:37:43 +01:00
TheBusyBiscuit	b4faad9a72	Reduced technical debt on MultiTools	2019-12-01 18:35:15 +01:00
TheBusyBiscuit	b5cc48fd9b	Changed Grappling Hook Recipe	2019-12-01 18:24:52 +01:00
TheBusyBiscuit	135fe34221	Merge pull request #1275 from J3fftw1/fix/fix-guide-issue-reeee ... Fixes #1272 & #1273	2019-12-01 16:58:02 +01:00
TheBusyBiscuit	51b347afe8	Changed a few category icons	2019-12-01 16:54:59 +01:00
TheBusyBiscuit	552c907f21	Fixed some christmas items	2019-12-01 16:54:50 +01:00
J3fftw1	90bcc2196c	Fixes #1272 & #1273	2019-12-01 16:28:57 +01:00
TheBusyBiscuit	dbab114d8f	Possibly fixes #1266	2019-11-30 01:00:24 +01:00
TheBusyBiscuit	ae74412fac	Enhanced randomizer algorithm for Gold Pans	2019-11-30 00:58:35 +01:00
TheBusyBiscuit	41327d637c	Added new API class	2019-11-30 00:44:44 +01:00
TheBusyBiscuit	d5482f5496	[CI skip] Some additional API work	2019-11-28 20:23:39 +01:00
TheBusyBiscuit	6312d6c431	Merge pull request #1270 from pentabulge/master ... Updated recipes for Automated Panning Machine	2019-11-28 19:36:53 +01:00
TheBusyBiscuit	3a809ad5ab	Merge pull request #1268 from SoSeDiK/researches ... Changed loading order	2019-11-28 19:36:38 +01:00
TheBusyBiscuit	015159dfe8	Fixes #1264	2019-11-28 19:35:28 +01:00
TheBusyBiscuit	95e5da325b	Restructured a bit of the API (for future versions)	2019-11-28 19:34:43 +01:00
penta	ebe9375a80	Added Iron Nuggets & Soul Sand drops to recipes	2019-11-28 17:34:12 +01:00
poma123	19b604f1de	Added javadocs to #getBlock	2019-11-27 17:39:08 +01:00
poma123	88f5d412e5	Event calling added into "movedig"	2019-11-27 17:35:58 +01:00
SoSeDiK	b39a08d557	Changed loading order ... Fixes researching not being enabled by default when starting the server for the first time	2019-11-27 18:29:45 +02:00
SoSeDiK	f63c290041	Minor changes to formatting ... - Fixed color - Removed empty lines - Changed formatting according to the other pages in the guide	2019-11-27 18:23:11 +02:00
poma123	b069f9c354	Added AndroidMineEvent	2019-11-26 22:46:00 +01:00
J3fftw1	eea32be7dd	removed empty lines	2019-11-26 19:30:52 +01:00
J3fftw1	23202d1cd6	few more fixes	2019-11-26 19:29:13 +01:00
J3fftw1	80094b4f1b	Merge branch 'master' into qol/sf-version	2019-11-26 19:26:44 +01:00
J3fftw1	334a1058b4	merged latest master	2019-11-26 19:16:39 +01:00
J3fftw1	b220f3a39e	added cscorelib version to the guide	2019-11-26 19:00:35 +01:00
TheBusyBiscuit	61a58d87dd	Added Iron Nuggets to Gold Pan drops	2019-11-26 00:48:47 +01:00
TheBusyBiscuit	c9bd5840e0	Added Nether Gold Pan	2019-11-26 00:39:54 +01:00
TheBusyBiscuit	85227f0814	Merge pull request #1258 from NiekWilting/fix-titles ... Fixed the getTitle method.	2019-11-24 14:28:10 +01:00
Niek Wilting	1f9cbc0b13	Fixed the getTitle method.	2019-11-24 14:11:34 +01:00
TheBusyBiscuit	0a44fa5671	Revamped Guide Settings Menu	2019-11-24 13:23:16 +01:00
TheBusyBiscuit	7ad4d92a14	[CI skip] Added Slimefun Guide and Recipe Types to custom item model ... service	2019-11-22 14:57:04 +01:00
TheBusyBiscuit	8a605404c1	Added "Flint to Cobblestone" Recipe to the Compressor	2019-11-21 20:36:50 +01:00
TheBusyBiscuit	28ed785cf7	Merge pull request #1247 from J3fftw1/research/jerk ... added jerkys to research	2019-11-17 21:31:44 +01:00
J3fftw1	1ac713cb58	Update ResearchSetup.java	2019-11-17 21:31:10 +01:00
TheBusyBiscuit	b1950447d6	Added more wiki pages to the guide	2019-11-17 21:30:39 +01:00
J3fftw1	f33218c10e	Update ResearchSetup.java	2019-11-17 21:29:59 +01:00
J3fftw1	8cb7108c27	reeeeeeeee sowwe	2019-11-17 18:49:06 +01:00
J3fftw1	a6129e65e9	fixed the tabs and changed jerky to jerky's ... crossing fingers for correct use of '	2019-11-17 18:45:50 +01:00
J3fftw1	4b044cba16	fixed suggested changes	2019-11-17 18:26:54 +01:00
J3fftw1	152dcac0c7	fixed the changes SoSeDiK suggested/requested	2019-11-17 11:19:37 +01:00
J3fftw1	29543f4a2a	changes	2019-11-16 23:48:30 +01:00
Daniel Walsh	1569f7e05e	Fix #1229	2019-11-16 22:06:26 +00:00
J3fftw1	4a83ecca07	added jerkys to research	2019-11-16 20:08:46 +01:00
TheBusyBiscuit	0a08690ae9	Merge pull request #1244 from poma123/patch-1 ... AutoDisenchantEvent	2019-11-16 17:47:32 +01:00
Poma123	87caf6ee45	Update AutoDisenchantEvent.java	2019-11-16 17:03:56 +01:00
Poma123	da0fe57ab7	Update AutoDisenchantEvent.java	2019-11-16 16:58:27 +01:00
Poma123	918d9c3506	Update AutoDisenchanter.java	2019-11-16 16:36:45 +01:00
Poma123	212b7cffd3	Update AutoDisenchantEvent.java	2019-11-16 16:35:22 +01:00
Poma123	72a7f4598f	Update and rename DisenchanterEvent.java to AutoDisenchantEvent.java	2019-11-16 16:34:14 +01:00
Poma123	201159f3bf	Update AutoDisenchanter.java	2019-11-16 16:29:59 +01:00
Poma123	537fc57f48	Update AutoDisenchanter.java	2019-11-16 16:27:15 +01:00
Poma123	d18adecb9a	Update DisenchanterEvent.java	2019-11-16 16:26:28 +01:00
Poma123	fa57e61447	Update AutoDisenchanter.java	2019-11-16 15:50:52 +01:00
Poma123	6f3bf2db13	Update DisenchanterEvent.java	2019-11-16 15:49:06 +01:00
Poma123	c6428c0e4b	Update AutoDisenchanter.java	2019-11-16 14:09:09 +01:00
Poma123	f0c0919bce	Add DisenchanterEvent	2019-11-16 14:08:38 +01:00
TheBusyBiscuit	fcf9b547c1	Merge pull request #1230 from SoSeDiK/transmitters ... Transmitters	2019-11-16 14:08:22 +01:00
TheBusyBiscuit	09ab124e36	Added Output Chest support to the Table Saw	2019-11-10 20:18:06 +01:00
SoSeDiK	78c81bafdb	Merge branch 'master' into transmitters	2019-11-10 21:04:50 +02:00
TheBusyBiscuit	7890edd295	Added Output Chest Support to the Automated Panning Machine	2019-11-10 19:44:53 +01:00
TheBusyBiscuit	a10fe1e514	Fixed custom model data	2019-11-10 18:54:53 +01:00
TheBusyBiscuit	40616ee47e	Merge pull request #1239 from TheBusyBiscuit/custom-textures ... Added support for custom item models	2019-11-10 18:52:36 +01:00
TheBusyBiscuit	97d8ce1546	Moved CoreProtect integration to CS-CoreLib2	2019-11-10 18:52:18 +01:00
TheBusyBiscuit	3e30ce8d14	Reduced technical debt	2019-11-10 18:43:37 +01:00
TheBusyBiscuit	2459469c9d	Added support for custom item models	2019-11-10 17:46:18 +01:00
TheBusyBiscuit	2c7e155aa1	Added different kinds of Jerky to the Auto-Drier	2019-11-10 13:51:56 +01:00
TheBusyBiscuit	25f8566196	Merge pull request #1222 from AlexLander123/fixes ... Changed method of accessing reactor from access port	2019-11-10 13:01:19 +01:00
TheBusyBiscuit	fc67fac34c	[CI skip] Changed default version string	2019-11-10 13:01:07 +01:00
AlexLander123	c13ec9903c	Ancient altar no longer able to craft items that are not unlocked	2019-11-06 02:17:52 +08:00
AlexLander123	9442fa65ca	Fixed ancient alter logic	2019-11-06 00:56:03 +08:00
AlexLander123	e4efed0640	Made requested changes ... - Added null check - Changed "a access port" to "the access port" - Removed extra menu.open(p)	2019-11-06 00:08:25 +08:00
SoSeDiK	2fb92c5083	Update GPSNetwork.java	2019-11-04 16:36:10 +02:00
SoSeDiK	0302810c9c	Replaced double with int	2019-11-04 16:33:40 +02:00
SoSeDiK	09c02b7848	Fixed transmitter locations	2019-11-04 16:28:12 +02:00
TheBusyBiscuit	8895beb83a	[CI skip] Minor refactoring	2019-11-03 23:43:11 +01:00
TheBusyBiscuit	57da6db9be	Reduced technical debt and improved talisman performance	2019-11-03 21:32:44 +01:00
TheBusyBiscuit	a1e47d5ce0	Many bug fixes, many guide improvements	2019-11-03 20:36:46 +01:00
TheBusyBiscuit	27019c9ceb	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2019-11-03 20:28:35 +01:00
TheBusyBiscuit	6a1b6ffd92	Added support for ALL Vanilla Recipes (+ Faster Guide Responses)	2019-11-03 20:28:25 +01:00
Daniel Walsh	2febbe4d1c	order	2019-11-03 19:05:32 +00:00
Daniel Walsh	d88291e215	Bring across repair cost in the disenchanter	2019-11-03 19:03:55 +00:00
TheBusyBiscuit	d86cb5e5b6	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2019-11-03 19:23:39 +01:00
TheBusyBiscuit	fc6bd05b4f	[CI skip] Merge pull request #1223 from J3fftw1/good/fix/yes/yes ... Fixes	2019-11-03 19:23:19 +01:00
TheBusyBiscuit	beebbda2dd	Fixes #1224	2019-11-03 19:20:22 +01:00
TheBusyBiscuit	5c860cbfa4	Fixes #1226	2019-11-03 19:20:12 +01:00
J3fftw1	cade8df053	Fixes #1219	2019-10-31 16:24:27 +01:00
AlexLander123	6dd56e23f2	Changed method of accessing reactor from access port ... The change is made to stop inventory.no-access message when opening access port due to canOpen(Block, Player) returning false	2019-10-31 22:01:53 +08:00
TheBusyBiscuit	05858309c5	[CI skip] Reduced technical debt	2019-10-29 09:13:32 +01:00
TheBusyBiscuit	7ba0eba4e9	Fixes #1211	2019-10-28 14:53:54 +01:00
AlexLander123	8601986c09	Allow reactors to take in fuel from access port ... - Also allow reactors to take in fuel in bulk	2019-10-28 04:02:06 +08:00
TheBusyBiscuit	9f3c3a413b	Some optimizations, also changed /sf timings to use floating point times	2019-10-27 20:07:12 +01:00
TheBusyBiscuit	e036e0f756	Fixes #1206	2019-10-27 14:18:31 +01:00
TheBusyBiscuit	bf4991264b	Migrated more Items to the new System (+ Added auto-migration)	2019-10-27 14:38:39 +01:00
TheBusyBiscuit	57e1126553	Optimized and cleaned up guide	2019-10-20 16:41:28 +02:00
TheBusyBiscuit	1c12b892fe	Merge pull request #1203 from J3fftw1/veinminerfix ... fixes #1202	2019-10-20 14:25:25 +02:00
J3fftw1	852b4bfc2a	fixes #1202	2019-10-20 14:19:27 +02:00
TheBusyBiscuit	ad3ca513ad	Fixed Multi Tools	2019-10-19 19:06:38 +02:00
TheBusyBiscuit	783a66d2da	Fixed Food	2019-10-19 18:20:08 +02:00
TheBusyBiscuit	bb2d9d851f	Fixes #1153	2019-10-19 18:18:17 +02:00
TheBusyBiscuit	41811b90f1	[CI skip] Added some documentation to the code	2019-10-19 16:48:22 +02:00
TheBusyBiscuit	a3bf63a023	More optimizations (+ Added more Jerky Meat)	2019-10-19 16:16:40 +02:00
TheBusyBiscuit	3eed8cebc6	Another fix	2019-10-19 15:15:11 +02:00
TheBusyBiscuit	70cc1d04f4	Fixes #1196	2019-10-19 15:14:05 +02:00
TheBusyBiscuit	c5341a6b02	Fixes #1196	2019-10-19 15:04:45 +02:00
TheBusyBiscuit	fc7c4e4d81	Fixed #1200	2019-10-19 12:53:13 +02:00
TheBusyBiscuit	260c3a51dd	More code cleanup (+ Added Sweet Berries Organic Food/Fertilizer)	2019-10-19 10:30:15 +02:00
AlexLander123	1dc669740c	Allow /sf cheat to have all categories unlocked ... - If the player who who is using /sf cheat have not unlocked the category, they will still have access to it - Removed empty code	2019-10-18 21:27:28 +08:00
J3fftw1	576b297b50	Fixed ExplosivePickaxe	2019-10-18 00:15:48 +02:00
J3fftw1	470f5f1afe	fixed requested changes	2019-10-17 23:23:25 +02:00
J3fftw1	10fe7238ad	fixed broken items	2019-10-17 23:14:43 +02:00
TheBusyBiscuit	06e3125a6d	Repositioned back button for guide search	2019-10-17 01:33:49 +02:00
TheBusyBiscuit	f71b925a41	Improved Guide Search	2019-10-17 01:27:00 +02:00
TheBusyBiscuit	ee6dfae045	Fixed Guide Search's back button	2019-10-17 01:21:04 +02:00
TheBusyBiscuit	5fa021469f	Added a logging message	2019-10-17 01:12:47 +02:00
TheBusyBiscuit	07827ecc53	Moved Guide History to Player Profiles	2019-10-17 01:08:14 +02:00
TheBusyBiscuit	45a688e148	Added wiki pages to the guide	2019-10-17 00:49:55 +02:00
TheBusyBiscuit	18b5bda4a8	[CI skip] Introduced proper Maven structure	2019-10-17 00:37:46 +02:00
TheBusyBiscuit	20e3f2b9ce	Some more bug fixes and optimizations	2019-10-14 20:50:57 +02:00
TheBusyBiscuit	7e0eb29040	Minor optimization	2019-10-14 17:58:15 +02:00
TheBusyBiscuit	b2fd914cee	Fixed Backpacks	2019-10-14 17:18:37 +02:00
TheBusyBiscuit	6865ab8c6c	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2019-10-14 17:18:08 +02:00
TheBusyBiscuit	fef43314f9	Fixed Backpacks not working	2019-10-14 17:17:50 +02:00
TheBusyBiscuit	fb652fe41d	Another fix	2019-10-14 09:54:23 +02:00
TheBusyBiscuit	2a475811de	Fixes #1180 (+ Improvements on MultiTool performance)	2019-10-14 09:31:14 +02:00
creator3	9551bf5a5c	Fix major BlockStorage performance regression	2019-10-13 19:01:00 -04:00
TheBusyBiscuit	090f45d93f	Merge pull request #1176 from WalshyDev/qol/improved-timings ... Order timings	2019-10-13 19:05:16 +02:00
TheBusyBiscuit	005fbbdd13	Minor changes and optimizations	2019-10-13 19:05:04 +02:00
Daniel Walsh	d2e1dabf47	okie	2019-10-13 17:45:54 +01:00
TheBusyBiscuit	3239616f50	Hotfix 2	2019-10-13 18:44:59 +02:00
Daniel Walsh	8b4d927753	Fix NPE	2019-10-13 17:33:58 +01:00
Daniel Walsh	22a9f8955a	Improve and also order console output	2019-10-13 17:32:42 +01:00
TheBusyBiscuit	a1e55d0d92	Hotfix	2019-10-13 18:26:18 +02:00
TheBusyBiscuit	2fc05354a0	Some more optimizations	2019-10-13 18:14:25 +02:00
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