922 Commits

Author	SHA1	Message	Date
TheBusyBiscuit	eecdb61223	Fixed compilation	2020-08-04 09:53:50 +02:00
TheBusyBiscuit	04a71a2408	Merge branch 'cleanup/blockplacing' of https://github.com/TheBusyBiscuit/Slimefun4 into cleanup/blockplacing	2020-08-04 09:52:59 +02:00
TheBusyBiscuit	7cc795f30e	One more change	2020-08-04 09:52:53 +02:00
TheBusyBiscuit	54aa45d1d2	Merge branch 'master' into cleanup/blockplacing	2020-08-04 09:47:51 +02:00
TheBusyBiscuit	484c7a22ec	Fixes #2180	2020-08-04 09:46:35 +02:00
TheBusyBiscuit	f409b869ae	Small performance optimization for bows	2020-08-04 09:46:04 +02:00
TheBusyBiscuit	137e91ad12	Fixes #2181	2020-08-04 01:16:20 +02:00
TheBusyBiscuit	8f289dcdbe	Fixes #2181	2020-08-04 01:15:14 +02:00
TheBusyBiscuit	56b78eac61	Fixes #2183	2020-08-04 00:58:43 +02:00
TheBusyBiscuit	cafa66b1a8	Fixes #2184	2020-08-04 00:48:23 +02:00
TheBusyBiscuit	012a0a7df9	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 ... into cleanup/blockplacing Conflicts: CHANGELOG.md	2020-08-03 17:28:17 +02:00
TheBusyBiscuit	d8f5992282	Fixes #2103	2020-08-03 17:25:27 +02:00
TheBusyBiscuit	8d1e427409	A few more changes	2020-08-03 00:30:58 +02:00
dniym	17f84bcffd	Update PiglinBarterDrop.java ... done	2020-08-02 17:44:57 -04:00
dniym	ecb3a354ff	Update PiglinBarterDrop.java ... fixed	2020-08-02 17:44:11 -04:00
dniym	9287e1098d	Update PiglinListener.java ... fixed	2020-08-02 17:43:26 -04:00
TheBusyBiscuit	1aeba31a96	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 ... into cleanup/blockplacing Conflicts: CHANGELOG.md	2020-08-02 23:15:05 +02:00
dniym	21305ddfdb	Update PiglinListener.java ... fixed a compile error	2020-08-02 16:37:19 -04:00
dniym	9edc082230	Update PiglinBarterDrop.java	2020-08-02 16:29:08 -04:00
dniym	c2376b90b3	Update PiglinListener.java ... made requested changes.	2020-08-02 16:25:39 -04:00
Lleyton Gray	43838d7270	Applying suggestion ... Signed-off-by: Lleyton Gray <lleyton@innatical.com>	2020-08-02 13:07:55 -07:00
TheBusyBiscuit	1389085932	Fixed Reinforced Spawners	2020-08-02 22:01:32 +02:00
Lleyton Gray	3703aaa993	Add ItemSetting for toggling mining of Ancient Debris. ... Signed-off-by: Lleyton Gray <lleyton@innatical.com>	2020-08-02 12:52:16 -07:00
TheBusyBiscuit	d20650855c	Fixes #2179	2020-08-02 21:45:58 +02:00
TheBusyBiscuit	b26f2a1ca8	Merge branch 'cleanup/blockplacing' of https://github.com/TheBusyBiscuit/Slimefun4 into cleanup/blockplacing	2020-08-02 21:37:03 +02:00
TheBusyBiscuit	a0b9579514	Added ToolUseHandler	2020-08-02 21:36:49 +02:00
lleyton	4c2b6bd1e7	Merge pull request #1 from TheBusyBiscuit/master ... Sync Upstream with Fork	2020-08-02 12:18:47 -07:00
dniym	eed7b873c7	Update PiglinBarterDrop.java ... made requested changes	2020-08-02 11:46:46 -04:00
dniym	8305729cfb	Update RandomMobDrop.java ... made requested changes.	2020-08-02 11:45:19 -04:00
TheBusyBiscuit	6608c3c5d7	Merge branch 'master' into cleanup/blockplacing	2020-08-02 17:43:08 +02:00
TheBusyBiscuit	f32280a4ce	Fixes #2176	2020-08-02 17:39:09 +02:00
TheBusyBiscuit	6573a60016	Another commit full of cleanup stuff	2020-08-02 15:16:21 +02:00
TheBusyBiscuit	23d730cd7a	Some more refactoring	2020-08-02 14:04:24 +02:00
TheBusyBiscuit	bf65b310aa	Fixes #2147	2020-08-02 13:55:58 +02:00
TheBusyBiscuit	34b82d7a6f	Fixes #2164	2020-08-02 13:55:31 +02:00
TheBusyBiscuit	e52d062ef5	Reduced technical debt and clutter	2020-08-02 11:22:00 +02:00
Lleyton Gray	fadb31feb1	Allow Ancient Debris to be mined by Industrial Miners	2020-08-01 20:47:43 -07:00
TheBusyBiscuit	a472097798	Fixed androids rotating to the wrong side	2020-08-01 16:16:15 +02:00
TheBusyBiscuit	6580e82606	Removed deprecated things	2020-08-01 12:31:05 +02:00
TheBusyBiscuit	c510a8708c	Performance improvements for androids	2020-08-01 12:25:47 +02:00
TheBusyBiscuit	76362b2acb	Fixes #2166	2020-08-01 00:17:43 +02:00
TheBusyBiscuit	2fc18aed0a	Fixes #2162	2020-07-31 20:24:58 +02:00
TheBusyBiscuit	e380f8b972	Fixes #2165	2020-07-31 20:18:51 +02:00
TheBusyBiscuit	446191d4bf	Fixes #2156	2020-07-31 20:14:48 +02:00
dniym	80ee551ca2	Made requested changes.	2020-07-30 20:14:14 -04:00
TheBusyBiscuit	90685edae6	Added a permission node for the debug fish	2020-07-31 01:32:43 +02:00
TheBusyBiscuit	dcb00dff20	[CI skip] Reduced technical debt	2020-07-31 01:08:23 +02:00
TheBusyBiscuit	2f05b9e4f8	Various fixes and performance improvements, mainly for talismans	2020-07-30 17:20:21 +02:00
TheBusyBiscuit	0412a2aec1	Fixes #2151	2020-07-30 10:23:44 +02:00
TheBusyBiscuit	ce18519808	Re-added conditional github warning messages	2020-07-29 23:21:41 +02:00
TheBusyBiscuit	ac4cfd3d68	Fixes #2145	2020-07-29 21:57:08 +02:00
TheBusyBiscuit	5a1b868c91	Fixed Metrics	2020-07-29 13:13:48 +02:00
TheBusyBiscuit	eb8e689d2c	Fixes #2143	2020-07-29 13:03:52 +02:00
TheBusyBiscuit	8f2dc7cebc	[Ci skip] Fixed formatting	2020-07-29 12:39:04 +02:00
TheBusyBiscuit	2c3343ac5f	[Ci skip] Fixed Metrics?	2020-07-29 12:37:16 +02:00
dniym	4f5c1f6760	made requested changes	2020-07-26 12:06:06 -04:00
dniym	260a6f4f61	forgot one	2020-07-26 10:51:18 -04:00
dniym	65f8519805	made requested changes	2020-07-26 10:49:41 -04:00
dniym	ba8aafe312	made requested changes	2020-07-26 10:20:17 -04:00
TheBusyBiscuit	63569fac57	Reduced technical debt and refactored a bit	2020-07-26 13:03:33 +02:00
dniym	22a0623485	fixed formatting	2020-07-25 20:41:27 -04:00
dniym	9093e292a1	Rebased and re-commital of Piglin barter recipe addition.	2020-07-25 20:38:15 -04:00
poma123	0d11d5ae89	Requested changes	2020-07-26 00:33:33 +02:00
poma123	b8d399a92c	World-changing fix	2020-07-26 00:22:58 +02:00
poma123	ea2795d5b7	Implemented requested changes	2020-07-26 00:20:59 +02:00
TheBusyBiscuit	3ef6e2066a	Fixed a typo	2020-07-25 23:15:24 +02:00
TheBusyBiscuit	9435dfa2f2	Reduced technical debt and fixed a small issue	2020-07-25 15:29:45 +02:00
TheBusyBiscuit	447012efdf	Don't consume zombie pills in creative	2020-07-25 15:02:51 +02:00
TheBusyBiscuit	dc854326ff	Added sound effects to the Iron Golem Assembler	2020-07-25 14:59:53 +02:00
TheBusyBiscuit	e92e95c59e	Fixed Enchantment Rune	2020-07-25 14:57:05 +02:00
TheBusyBiscuit	c3ab3a6ecc	Fixed Enttiy Assemblers	2020-07-25 14:45:57 +02:00
TheBusyBiscuit	f15efd6cc2	Iron Golems require Carved Pumpkins	2020-07-25 14:42:29 +02:00
TheBusyBiscuit	107957a805	Fixed lore	2020-07-25 14:41:15 +02:00
TheBusyBiscuit	88604ee432	Fixed Iron Golem Assembler spawning Withers :o	2020-07-25 14:37:04 +02:00
TheBusyBiscuit	92ca696140	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 ... into experimental Conflicts: CHANGELOG.md	2020-07-25 14:27:12 +02:00
TheBusyBiscuit	42c57f8907	[CI skip] Small change	2020-07-25 14:19:09 +02:00
TheBusyBiscuit	ebce279cf2	Merge pull request #2121 from poma123/patch-2 fixes #2097 ... Fixed piglin SlimefunItem pickup	2020-07-25 13:56:58 +02:00
poma123	dde3ec26ba	Requested changes	2020-07-25 13:51:10 +02:00
poma123	a323b09e38	Fixed a tremendous mistake	2020-07-25 13:41:11 +02:00
poma123	5ff93b75e0	Added PiglinListener	2020-07-25 13:37:04 +02:00
poma123	a6d69ee9d6	Requested changes	2020-07-25 12:31:52 +02:00
TheBusyBiscuit	33f7c42e2c	Added an option to disable the "Ignoring duplicate block" message	2020-07-25 12:28:04 +02:00
poma123	17a68ddcf5	Removed unnecessary Zombified Piglin check	2020-07-25 12:19:02 +02:00
poma123	9fb79c8622	Fixed piglin SlimefunItem pickup	2020-07-25 12:04:22 +02:00
TheBusyBiscuit	abc47af565	Fixed exception handling	2020-07-24 19:11:38 +02:00
TheBusyBiscuit	499bbdbf70	Merge branch 'master' into experimental	2020-07-24 16:36:08 +02:00
TheBusyBiscuit	47be5f16ce	[CI skip] Refactoring, also removed more deprecated things	2020-07-24 16:33:09 +02:00
TheBusyBiscuit	388300f25b	Merge pull request #2117 from kylehassall27/CrushCompressedCoal ... Add recipes to crush compressed carbon into carbon and carbon into coal	2020-07-24 16:15:59 +02:00
TheBusyBiscuit	d69ef1effb	Merge pull request #2107 from WalshyDev/feature/metrics-module ... Metrics!	2020-07-24 16:06:53 +02:00
KykyRocks1	dca5348aae	Added recipes to crush compressed carbon into carbon and carbon into coal	2020-07-23 15:56:44 -04:00
TheBusyBiscuit	1f7b75b823	Added Iron Golem Assembler (experimental)	2020-07-23 12:02:53 +02:00
Daniel Walsh	b13776d729	Final changes	2020-07-23 10:37:23 +01:00
Daniel Walsh	6f92bd6c28	Requested changes	2020-07-23 09:51:35 +01:00
TheBusyBiscuit	ee62a9b004	Optimized Enhanced Furnaces for Paper and fixes #1894	2020-07-23 01:23:03 +02:00
TheBusyBiscuit	916fb554d0	Fixes #2086	2020-07-23 00:52:59 +02:00
Daniel Walsh	d547d61151	Requested changes	2020-07-22 20:45:55 +01:00
TheBusyBiscuit	ba4282c3e7	[CI skip] Merge pull request #2109 from WalshyDev/change/some-small-changes ... Fix some regex, finals and replace isPresent with ifPresent	2020-07-22 21:23:20 +02:00
TheBusyBiscuit	8c867c09b6	[CI skip] Some documentation	2020-07-22 21:17:25 +02:00
TheBusyBiscuit	31e4cfa29b	Merge branch 'master' into feature/metrics-module	2020-07-22 20:43:39 +02:00
Daniel Walsh	5e3eccfaa4	Fix some regex, finals and replace isPresent with ifPresent	2020-07-22 18:06:42 +01:00