1036 Commits

Author	SHA1	Message	Date
TheBusyBiscuit	a2b2478394	Update EnergyNet.java	2020-08-24 02:18:32 +02:00
TheBusyBiscuit	d998f3ec8c	Merge branch 'master' into refactoring/block-energy	2020-08-24 02:11:59 +02:00
TheBusyBiscuit	155092a321	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 ... Conflicts: pom.xml	2020-08-23 17:57:13 +02:00
TheBusyBiscuit	f51a19777f	[CI skip] Added more Unit tests	2020-08-23 17:56:38 +02:00
Sfiguz7	89fdf45d28	I said, fixed extra indentation	2020-08-23 17:50:31 +02:00
Sfiguz7	44451d6244	Fixed extra indentation	2020-08-23 17:49:44 +02:00
Sfiguz7	813200b29c	Made requested changes	2020-08-23 15:36:10 +02:00
Sfiguz7	bdd2adc21e	Cleared unused imports I forgot to delete	2020-08-23 13:56:39 +02:00
Sfiguz7	eb66f3e183	Added option to drop excess items on /sf give	2020-08-23 13:54:51 +02:00
TheBusyBiscuit	ec95797cbf	Fixes #2240	2020-08-22 02:38:17 +02:00
TheBusyBiscuit	b36e3e41a8	Reduced technical debt	2020-08-22 02:36:36 +02:00
TheBusyBiscuit	e839ece670	Reduced technical debt	2020-08-22 00:57:44 +02:00
TheBusyBiscuit	95655dc6fc	A few fixes and performance improvements	2020-08-21 15:19:08 +02:00
TheBusyBiscuit	167326292d	Maybe fixes #1951 (+ performance improvements)	2020-08-20 23:25:43 +02:00
TheBusyBiscuit	29092b87c9	Merge branch 'experimental' into IcePick	2020-08-20 22:56:09 +02:00
TheBusyBiscuit	d8d4811974	Merged Nitwit Rune and Shulker Shell PRs	2020-08-20 18:20:25 +02:00
TheBusyBiscuit	65021f7615	Merge branch 'rune' into ShulkerShell	2020-08-20 17:33:27 +02:00
TheBusyBiscuit	88be3e79ff	Merge branch 'master' into refactoring/block-energy	2020-08-20 16:55:35 +02:00
LinoxGH	73d623a0fd	Github Web and its indent issues.	2020-08-20 14:39:31 +03:00
LinoxGH	37bacaa8cb	Apparently SlimefunPlugin.instance is private now.	2020-08-20 14:30:21 +03:00
LinoxGH	bf3b04a4c5	Oops sorry for this silly mistake	2020-08-20 14:19:48 +03:00
LinoxGH	0946b88cd1	Fixed symbol name issues in ClimbingPick.java	2020-08-20 14:11:46 +03:00
LinoxGH	a54e8623d3	Merge branch 'master' into ShulkerShell	2020-08-20 12:21:50 +03:00
LinoxGH	5f78e7a854	Merge branch 'master' into IcePick	2020-08-20 11:43:14 +03:00
TheBusyBiscuit	9787cf734b	Renamed to Nitwit Rune	2020-08-19 14:31:07 +02:00
TheBusyBiscuit	b1abf7bb99	Fixed categories	2020-08-19 14:12:51 +02:00
TheBusyBiscuit	8c5d15e311	Increased Bartering chance	2020-08-19 14:11:33 +02:00
TheBusyBiscuit	66fa277014	A few additional changes	2020-08-19 14:07:42 +02:00
TheBusyBiscuit	57b3f06aa6	Merge pull request #2220 from dniym/NitwitRune ... Added Rune of Unemployment	2020-08-19 13:58:16 +02:00
TheBusyBiscuit	aa22e7c9b2	[CI skip] A bit of refactoring and documentation	2020-08-19 13:54:46 +02:00
dniym	e13e7e1400	Update RuneOfUnemployment.java ... made requested changes	2020-08-18 15:30:12 -04:00
TheBusyBiscuit	9d4d2060ba	[CI skip] Added a few more strings to translation files	2020-08-18 14:45:51 +02:00
TheBusyBiscuit	6be0709aea	Fixes #2138	2020-08-18 14:18:44 +02:00
TheBusyBiscuit	8e8a87fce6	Fixed ChestTerminal timings showing up as cargo nodes	2020-08-17 17:31:15 +02:00
TheBusyBiscuit	fb47574fe8	Added poma's requested change ... Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>	2020-08-17 16:27:26 +02:00
TheBusyBiscuit	a10813036b	Added poma's suggested change ... Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>	2020-08-17 13:30:18 +02:00
TheBusyBiscuit	0f73b62658	Added Walshys suggested change ... Co-authored-by: Daniel Walsh <walshydev@gmail.com>	2020-08-17 13:30:03 +02:00
TheBusyBiscuit	07c62d5932	Added Walshys suggested change ... Co-authored-by: Daniel Walsh <walshydev@gmail.com>	2020-08-17 13:29:54 +02:00
TheBusyBiscuit	33f6f039ec	Added Walshys suggested change ... Co-authored-by: Daniel Walsh <walshydev@gmail.com>	2020-08-17 13:29:44 +02:00
TheBusyBiscuit	d4953dd029	[CI skip] Added more Unit Tests	2020-08-17 13:00:22 +02:00
TheBusyBiscuit	1bba2efa3e	[CI skip] Added more unit tests	2020-08-17 02:23:28 +02:00
TheBusyBiscuit	7a31c88ce9	Fixes #2207	2020-08-17 00:32:18 +02:00
TheBusyBiscuit	c98fe74ea9	Merge branch 'master' into NitwitRune	2020-08-17 00:25:18 +02:00
dniym	42e4b1620d	Update SlimefunItemSetup.java ... Fixed merge conflict 2	2020-08-16 13:52:09 -04:00
dniym	45b63a149b	Update HeadTexture.java ... Resolved Merge Conflict 1	2020-08-16 13:45:18 -04:00
dniym	b22bdb55ff	Made requested changes	2020-08-16 13:33:36 -04:00
TheBusyBiscuit	2a8abcbdbf	Fixed unit tests, also improved test coverage	2020-08-16 15:57:09 +02:00
TheBusyBiscuit	037e8d83df	Small performance improvement, also reduced technical debt a bit	2020-08-16 15:49:47 +02:00
TheBusyBiscuit	eb5b2678e0	Fixes #2077	2020-08-14 01:46:05 +02:00
dniym	644878c534	Made Requested Changes	2020-08-13 16:21:18 -04:00
TheBusyBiscuit	c0d18c5c89	Fixes #2217	2020-08-13 21:13:19 +02:00
dniym	a33cfdb12d	added a check for jobless villagers	2020-08-12 16:08:15 -04:00
dniym	a1be08034b	made requested changes	2020-08-12 16:04:35 -04:00
dniym	b27059240b	Added Rune of Unemployment ... Approved Suggestion: #284 - Vitamin_CE#9804	2020-08-11 20:58:17 -04:00
TheBusyBiscuit	923b59c6e7	[CI skip] Reduced technical debt	2020-08-11 16:28:52 +02:00
TheBusyBiscuit	e406481b98	[CI skip] Replaced the last tabs with spaces	2020-08-11 16:23:31 +02:00
TheBusyBiscuit	1aaedf0825	[CI skip] Added more Unit Tests	2020-08-11 11:17:08 +02:00
TheBusyBiscuit	485a80f6ef	Fixes #2209	2020-08-09 11:41:15 +02:00
TheBusyBiscuit	66f4c48b4b	Fixes #2205	2020-08-09 11:33:48 +02:00
TheBusyBiscuit	7de9dd6683	Industrial Miners can now also mine Gilded Blackstone	2020-08-08 12:51:26 +02:00
TheBusyBiscuit	9f49dd3981	Reduced technical debt	2020-08-08 12:47:39 +02:00
TheBusyBiscuit	c08eadcaae	Small performance improvement	2020-08-08 00:48:09 +02:00
TheBusyBiscuit	bffbb488ba	[CI skip] Added Unit Tests for Piglins	2020-08-08 00:45:01 +02:00
poma123	c2fa590aa1	Requested changes	2020-08-07 22:43:58 +02:00
poma123	6ab196a03d	Requested changes	2020-08-07 22:04:15 +02:00
poma123	87f8e7ae8c	Fixed Industrial Miner debris issue	2020-08-07 21:46:59 +02:00
TheBusyBiscuit	9b21c1ade1	Merge pull request #2202 from dniym/elecPressSand ... Elec press sand	2020-08-07 19:10:11 +02:00
dniym	1fde84a4c7	Approved Suggestion #272 - AutoBio#8746	2020-08-06 21:08:59 -04:00
TheBusyBiscuit	9de72881ab	[CI skip] Fixed some URLs	2020-08-07 00:31:09 +02:00
TheBusyBiscuit	d55a546c42	Fixes #2168	2020-08-06 16:24:41 +02:00
TheBusyBiscuit	8d7d157503	Improved documentation	2020-08-06 00:54:49 +02:00
TheBusyBiscuit	ef01c85888	Some refactoring, requested changes	2020-08-06 00:30:33 +02:00
TheBusyBiscuit	46a01c368f	Merge pull request #2192 from poma123/fix/brewing ... Fixed prevent Slimefun items from being added to a Brewing Stand	2020-08-05 16:49:54 +02:00
TheBusyBiscuit	32849ca563	Merge branch 'master' into refactoring/block-energy	2020-08-05 16:45:34 +02:00
TheBusyBiscuit	7c3599c862	[CI skip] Reduced technical debt	2020-08-05 16:44:43 +02:00
TheBusyBiscuit	c168497e79	[CI skip] Reduced technical debt	2020-08-05 13:31:35 +02:00
poma123	9454c890ea	Refactoring	2020-08-05 13:02:35 +02:00
poma123	6de4130d05	Fixed prevention when brewing with slimefun items	2020-08-05 12:41:48 +02:00
TheBusyBiscuit	f50d1d2faa	Big performance improvements to Enhanced Furnaces when using Paper	2020-08-04 20:15:21 +02:00
TheBusyBiscuit	c56ebe9c23	Merge branch 'master' into IcePick	2020-08-04 19:12:00 +02:00
TheBusyBiscuit	18036aa181	Added a new entry to SlimefunItems.java	2020-08-04 19:07:00 +02:00
TheBusyBiscuit	f8a988261f	Fixed typo	2020-08-04 19:03:20 +02:00
TheBusyBiscuit	3adb634d8b	Make it not override the vanilla item anymore	2020-08-04 19:02:53 +02:00
TheBusyBiscuit	f9e9a7c491	Updated research id to not break compatibility	2020-08-04 19:00:38 +02:00
TheBusyBiscuit	06f64725d9	Improved performance for idling Enhanced Furnaces on Paper	2020-08-04 18:00:31 +02:00
TheBusyBiscuit	35684b60fc	Optimized performance for rainbow blocks	2020-08-04 17:59:41 +02:00
TheBusyBiscuit	d80fdac23b	Fixed debug fish	2020-08-04 15:49:58 +02:00
TheBusyBiscuit	b6ba6ce754	Updated all electric machines	2020-08-04 15:43:00 +02:00
TheBusyBiscuit	bc387ee47a	Updated EnergyNet code	2020-08-04 13:50:22 +02:00
TheBusyBiscuit	368d2f5798	Move block energy code to EnergyNetComponent	2020-08-04 13:29:45 +02:00
TheBusyBiscuit	8faf505999	Mark Korean as done	2020-08-04 12:50:48 +02:00
TheBusyBiscuit	e870f82afd	Added piglin bartering to translation files	2020-08-04 12:40:08 +02:00
TheBusyBiscuit	8a9dfe25a8	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2020-08-04 12:30:30 +02:00
TheBusyBiscuit	dbed8b55d9	[CI skip] Merge pull request #2136 from dniym/PiglinDropsFgithub ... Piglin drops fgithub	2020-08-04 12:25:26 +02:00
TheBusyBiscuit	0ff5fc7251	Small performance improvements for miner talismans	2020-08-04 10:19:24 +02:00
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