2526 Commits

Author	SHA1	Message	Date
Daniel Walsh	a64597e129	Merge pull request #3038 from Mooy1/fix/explosive-pick-handler	2021-05-10 21:20:02 +01:00
a	41d0a93275	Update ExplosiveTool.java	2021-05-10 13:59:32 -05:00
TheBusyBiscuit	bcdda9ab03	Fixes #3041	2021-05-10 18:54:13 +02:00
TheBusyBiscuit	8a8b8ce577	Merge pull request #3015 from Slimefun/performance/networks ... Improved memory usage of cargo/energy networks and fixed #3013	2021-05-10 18:44:01 +02:00
a	efd3d133f2	Update ExplosiveTool.java	2021-05-10 11:11:02 -05:00
TheBusyBiscuit	7a06dc3064	Merge pull request #3003 from Slimefun/fix/hologram-dupes ... Potentially fixed #2927	2021-05-09 17:04:29 +02:00
Varian Anora	10e3df78b8	Merge branch 'master' into fix/auto-disenchanter-strict-slot-order	2021-05-09 19:00:30 +07:00
Varian Anora	f5d1d3a947	Revert swapping item and secondItem	2021-05-09 18:59:54 +07:00
TheBusyBiscuit	81223004bf	Default values for item models are now read from a resource file.	2021-05-08 19:22:54 +02:00
TheBusyBiscuit	d81b25717f	Added an exclusion for unit tests	2021-05-08 18:59:06 +02:00
TheBusyBiscuit	a82a5d28f9	Implemented Walshy's suggestion to improve performance even further	2021-05-08 18:49:56 +02:00
a	d3527a1885	Update ExplosiveTool.java	2021-05-08 01:38:13 -05:00
Varian Anora	8d3d24bc5f	Revert to EnchantmentStorageMeta	2021-05-08 12:08:56 +07:00
Varian Anora	716c384349	Merge branch 'master' into fix/auto-disenchanter-strict-slot-order	2021-05-08 12:06:55 +07:00
TheBusyBiscuit	dc34ec8dfc	Merge branch 'master' into performance/networks	2021-05-07 14:15:30 +02:00
TheBusyBiscuit	5194dbb1db	Merge pull request #3031 from variananora/fix/pickaxe-of-the-seeker-localization ... Update Pickaxe of The Seeker Localization	2021-05-07 14:14:51 +02:00
Varian Anora	847bab7a86	Fixes #2978 ... Fix is stolen from #2982	2021-05-07 10:19:36 +07:00
Martin Brom	e7662dd04f	Add grinding of higher level lumps back into 4 lower level lumps	2021-05-06 18:40:19 +02:00
TheBusyBiscuit	a4aebf7bcd	[CI skip] Translators are now read from a json file. ... Next step is writing a GitHub action that auto-populates that file via the Crowdin API	2021-05-06 15:56:55 +02:00
Varian Anora	cc714b1722	Update Pickaxe of The Seeker Localization ... Moved locale path to follow current styling Added Pickaxe of The Seeker error message when no ores were found.	2021-05-06 20:02:35 +07:00
TheBusyBiscuit	8a1eba8fd4	[CI skip] Crowdin setup (squashed)	2021-05-05 18:10:02 +02:00
TheBusyBiscuit	81bf67b72c	Merge branch 'master' into fix/hologram-dupes	2021-05-04 10:08:49 +02:00
Freeze_Dolphin	c48ccc0149	Correction of wrongly spelled words.	2021-05-04 07:33:32 +00:00
Freeze_Dolphin	51b72d4dba	Revert "Correction of wrongly spelled words." ... This reverts commit 7e74c5a8b2.	2021-05-04 07:32:38 +00:00
Freeze_Dolphin	467075120a	Correction of wrongly spelled words.	2021-05-04 07:28:55 +00:00
TheBusyBiscuit	e51fcde16f	Update OutputChest.java	2021-05-03 15:28:11 +02:00
TheBusyBiscuit	0b55c9e8a0	Updated author tag	2021-05-03 15:24:19 +02:00
TheBusyBiscuit	7b615a66f2	Fixes #3013	2021-05-03 15:22:13 +02:00
TheBusyBiscuit	399359ae25	Reduced memory usage for networks and enforce world limitation	2021-05-03 15:19:33 +02:00
TheBusyBiscuit	c29d0e5530	Fixed #3012	2021-05-03 13:05:22 +02:00
svr333	e7557ca680	Merge branch 'master' into fix/hologram-dupes	2021-05-01 01:46:58 +02:00
TheBusyBiscuit	df7b262d14	Fixed #3007	2021-05-01 00:09:38 +02:00
TheBusyBiscuit	9f3f23fb75	Potentially fixed #2927	2021-04-30 16:18:24 +02:00
TheBusyBiscuit	a0695e0df4	Merge pull request #2994 from Mooy1/android-click-fix ... Fix android click handler errors while moving	2021-04-30 12:51:34 +02:00
TheBusyBiscuit	5f1aeecdbf	[CI skip] Updated changelog ... Also fixed MultiCategory not respecting guide main page index.	2021-04-30 12:51:22 +02:00
TheBusyBiscuit	e609e9e0ae	Merge pull request #2993 from Mooy1/guide-history-fix ... Fixed #2593	2021-04-30 12:36:47 +02:00
TheBusyBiscuit	8c0fbfb295	More refactoring	2021-04-30 11:22:18 +02:00
TheBusyBiscuit	2382b940f1	Refactoring	2021-04-30 10:54:40 +02:00
TheBusyBiscuit	b92de66a27	[CI skip] Added missing import	2021-04-30 10:32:57 +02:00
TheBusyBiscuit	c215940cb9	Marked some items as unplaceable	2021-04-29 21:18:32 +02:00
TheBusyBiscuit	586e0516cf	[Ci skip] Some refactoring	2021-04-29 20:48:05 +02:00
TheBusyBiscuit	ced3cf9f50	Removed some deprecated methods	2021-04-29 20:37:54 +02:00
TheBusyBiscuit	90c8e2f278	Fixes #2999	2021-04-29 17:52:21 +02:00
a	a1619206ea	Update ProgrammableAndroid.java	2021-04-27 09:36:16 -05:00
a	bf5ada4eab	Update ProgrammableAndroid.java	2021-04-27 09:34:52 -05:00
a	f79840bf66	changes	2021-04-27 09:26:56 -05:00
Riley	31ddf8e7de	Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2021-04-26 18:55:24 -05:00
a	a1a6253961	Update ProgrammableAndroid.java	2021-04-26 18:43:10 -05:00
a	61ff68d34a	fix	2021-04-26 18:15:07 -05:00
TheBusyBiscuit	757d7613ac	[CI skip] Formatting	2021-04-26 18:06:25 +02:00