1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Commit Graph

785 Commits

Author SHA1 Message Date
TheBusyBiscuit
d0e7e21877 Performance and memory improvements 2020-11-25 14:27:46 +01:00
TheBusyBiscuit
354dd30e52 Removed EmeraldEnchants integration 2020-11-23 16:58:08 +01:00
TheBusyBiscuit
f689c2fc4f Added an item setting to the Infused Hopper to toggle it with redstone 2020-11-21 15:34:09 +01:00
TheBusyBiscuit
3bd595a930 Fixes #2421 2020-11-21 14:18:54 +01:00
TheBusyBiscuit
55188bfd0a Fixes #2518 (+ refactoring and documentation) 2020-11-21 14:06:38 +01:00
TheBusyBiscuit
5bf3e38bae Fixed Armor Stands getting damaged/pushed by Explosive Bow 2020-11-20 13:39:25 +01:00
TheBusyBiscuit
15f281504f More performance and memory improvements 2020-11-19 22:20:43 +01:00
TheBusyBiscuit
bb764b7584 Fixed Guide Settings showing "last activity" as a negative number 2020-11-19 21:00:28 +01:00
TheBusyBiscuit
9f1b8790aa [Ci skip] Updated changelog 2020-11-19 18:07:16 +01:00
TheBusyBiscuit
7e657c9810 A ton of performance improvements 2020-11-19 17:42:10 +01:00
TheBusyBiscuit
94752a9027 Fixes #2558 2020-11-19 15:01:47 +01:00
TheBusyBiscuit
177d1d81e0
[CI skip] Updated changelog 2020-11-19 14:45:55 +01:00
TheBusyBiscuit
86715cd3d0 Fixed CoreProtect not recognizing Slimefun blocks getting broken 2020-11-19 13:11:30 +01:00
TheBusyBiscuit
64fd5a54c3 Added an item setting to configure the Wind Staff velocity 2020-11-19 12:49:42 +01:00
TheBusyBiscuit
0cdd21f6bb Added a config option to delete excess cargo network items 2020-11-15 16:29:45 +01:00
TheBusyBiscuit
0b9ab8b6cc Fixes #2446 2020-11-14 18:44:07 +01:00
TheBusyBiscuit
503dbc8367 Fixes #2418 2020-11-14 18:32:53 +01:00
TheBusyBiscuit
05e983917a Added CoolerFeedPlayerEvent 2020-11-10 00:36:38 +01:00
TheBusyBiscuit
3170f143a2 Added a config option to disable network visualizations 2020-11-04 11:18:06 +01:00
TheBusyBiscuit
7a2586bfcb
[CI skip] Updated changelog 2020-11-03 09:41:32 +01:00
TheBusyBiscuit
1c5f2f650b Some refactoring and small fixes 2020-11-02 15:10:56 +01:00
TheBusyBiscuit
8536965962 Fixes #2517 2020-11-01 20:59:34 +01:00
TheBusyBiscuit
1141a01fd0 Fixes #2519 2020-11-01 20:46:29 +01:00
TheBusyBiscuit
6ced4d166e Fixes #2527 2020-11-01 20:12:34 +01:00
TheBusyBiscuit
210c8d20f4 Fixes #2499 2020-10-30 22:50:16 +01:00
TheBusyBiscuit
d90699ee7d
[CI skip] Updated changelog 2020-10-28 12:14:31 +01:00
TheBusyBiscuit
232ee74ceb Fixed contributors menu not showing everyone 2020-10-28 01:01:25 +01:00
TheBusyBiscuit
b3befbda49 Some code cleanup, documentation and paper optimizations 2020-10-28 00:44:35 +01:00
TheBusyBiscuit
487108df14 Fixes #2505 2020-10-25 14:40:05 +01:00
TheBusyBiscuit
cf283c24ab
[CI skip] Updated changelog 2020-10-20 17:42:57 +02:00
TheBusyBiscuit
48f8311a20
[CI skip] Updated changelog 2020-10-20 16:45:26 +02:00
TheBusyBiscuit
df03c4bd8d
[CI skip] Updated changelog 2020-10-19 12:49:43 +02:00
TheBusyBiscuit
95636818f5
[CI skip] Updated changelog 2020-10-18 19:21:46 +02:00
TheBusyBiscuit
e054fe6682 Fixes #2448 2020-10-18 13:17:18 +02:00
TheBusyBiscuit
4aff61f3b1 Removed 1.13 support 2020-10-17 12:54:36 +02:00
TheBusyBiscuit
e18c7cb245 Fixed a dupe bug with mcMMO 2020-10-15 13:50:12 +02:00
TheBusyBiscuit
88cf1f2df2 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2020-10-14 14:57:10 +02:00
TheBusyBiscuit
b88bad3ef6 Fixes #2452 2020-10-14 14:56:52 +02:00
TheBusyBiscuit
f75da6af33
[Ci skip] Seting a release date for RC-17 2020-10-14 14:40:10 +02:00
TheBusyBiscuit
42f849d891 Fixes #2423 2020-10-14 13:31:02 +02:00
TheBusyBiscuit
1ffe2fd493 Fixes #2411 2020-10-14 00:51:21 +02:00
TheBusyBiscuit
50e926d18a Fixes #2457 2020-10-14 00:34:04 +02:00
TheBusyBiscuit
de1eaca1dc Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2020-10-14 00:24:52 +02:00
TheBusyBiscuit
19de4c8476 Fixes #2454 (Added mcMMO support) 2020-10-14 00:24:01 +02:00
TheBusyBiscuit
8dfb235488
[CI skip] Updated changelog 2020-10-13 23:21:15 +02:00
TheBusyBiscuit
5c0b7e2ee2 Fixes #2468 2020-10-13 21:44:24 +02:00
TheBusyBiscuit
eeffb30f4a
[CI skip] Updated changelog 2020-10-13 01:52:07 +02:00
TheBusyBiscuit
87d319cd02
Merge pull request #2382 from LinoxGH/EnergyConnector
Energy Connectors
2020-10-12 15:49:50 +02:00
TheBusyBiscuit
612aad5d95 Fixes #2424 2020-10-12 12:11:28 +02:00
TheBusyBiscuit
3b7dd68164 Fixes #2450 2020-10-12 11:52:23 +02:00
TheBusyBiscuit
14e18d2962 Fixes #2455 2020-10-12 11:47:13 +02:00
TheBusyBiscuit
c65687acf7 [CI skip] Updated changelog 2020-10-11 18:09:03 +02:00
TheBusyBiscuit
bbe196e838
[CI skip] Updated changelog 2020-10-11 13:45:53 +02:00
LinoxGH
ad505b6cef
Merge branch 'master' into EnergyConnector 2020-10-11 00:26:43 +03:00
LinoxGH
6082abb9b6
Merge branch 'master' into ExplosivePickFix 2020-10-11 00:23:59 +03:00
LinoxGH
fdd33f9182
Update CHANGELOG.md 2020-10-11 00:20:02 +03:00
LinoxGH
8ce474331e
Update CHANGELOG.md 2020-10-10 16:05:41 +03:00
TheBusyBiscuit
d63d6189a9
Merge branch 'master' into performance/cobblestone 2020-10-10 13:49:10 +02:00
TheBusyBiscuit
83e8010e29 Lots of refactoring 2020-10-09 17:39:21 +02:00
TheBusyBiscuit
aab665ffea
Merge branch 'master' into tags 2020-10-09 11:46:47 +02:00
TheBusyBiscuit
a82eb7405a
[CI skip] Updated changelog 2020-10-08 21:20:38 +02:00
TheBusyBiscuit
43284f1534
Merge branch 'master' into performance/cobblestone 2020-10-08 16:19:03 +02:00
TheBusyBiscuit
2d00f3e704
Merge branch 'master' into tags 2020-10-08 16:16:11 +02:00
TheBusyBiscuit
359cba3c13
[CI skip] Updated changelog 2020-10-08 14:36:58 +02:00
poma123
cd00848795
Merge branch 'master' into tags 2020-10-07 17:55:26 +02:00
TheBusyBiscuit
ed8f0e243b Fixes #2405 2020-10-07 17:48:53 +02:00
TheBusyBiscuit
c3302d8cbd
Merge branch 'master' into tags 2020-10-07 17:44:27 +02:00
TheBusyBiscuit
354cb201c5
[CI skip] Updated changelog 2020-10-07 16:31:33 +02:00
poma123
7814bdcdee
Merge branch 'master' into tags 2020-10-07 16:11:41 +02:00
TheBusyBiscuit
7b179239e4
[CI skip] Updated changelog 2020-10-07 16:01:19 +02:00
TheBusyBiscuit
c33f73d2fe
[CI skip] Updated changelog 2020-10-07 14:30:01 +02:00
TheBusyBiscuit
47590ac972
Merge branch 'master' into tags 2020-10-06 21:07:49 +02:00
TheBusyBiscuit
d09a7e0f93 Fixes #2391 2020-10-06 21:05:39 +02:00
TheBusyBiscuit
07c84af3b5 Added NotConfigurable attribute 2020-10-06 21:01:18 +02:00
TheBusyBiscuit
b26924bf81
[CI skip] Updated changelog 2020-10-05 22:50:32 +02:00
TheBusyBiscuit
0e6fc92e28
Merge branch 'master' into tags 2020-10-04 00:46:37 +02:00
TheBusyBiscuit
e83e194784
[CI skip] Updated changelog 2020-10-04 00:39:31 +02:00
TheBusyBiscuit
6b3ae3b1cf
Merge branch 'master' into tags 2020-10-03 22:05:13 +02:00
TheBusyBiscuit
a2cb2eb324
[CI skip] Updated changelog 2020-10-03 22:03:30 +02:00
poma123
3ec39ec16a
Merge branch 'master' into tags 2020-10-03 21:46:28 +02:00
TheBusyBiscuit
49b0ec6a9e
[CI skip] Updated changelog 2020-10-03 21:29:13 +02:00
TheBusyBiscuit
ada6ce775c
[CI skip] Updated changelog 2020-10-03 21:13:46 +02:00
poma123
9605ed4d1f
Merge branch 'master' into performance/cobblestone 2020-10-02 14:51:18 +02:00
TheBusyBiscuit
815b5ce5c2
[CI skip] Updated changelog 2020-10-01 21:04:12 +02:00
TheBusyBiscuit
501394bd08
[CI skip] Updated changelog 2020-10-01 20:45:25 +02:00
LinoxGH
50e48ed87c
Merge branch 'master' into tags 2020-10-01 21:42:50 +03:00
TheBusyBiscuit
2e4f5d565f
[CI skip] Updated changelog 2020-10-01 20:28:28 +02:00
TheBusyBiscuit
2263c26d2c
[CI skip] Updated changelog 2020-10-01 11:00:51 +02:00
TheBusyBiscuit
9dcd4193f2
[CI skip] Updated changelog 2020-09-30 20:29:14 +02:00
TheBusyBiscuit
775275c661
Merge branch 'master' into performance/cobblestone 2020-09-29 20:59:10 +02:00
TheBusyBiscuit
20de967306 Improvements to block ticking 2020-09-29 20:38:41 +02:00
TheBusyBiscuit
277ecb4a29
Merge branch 'master' into tags 2020-09-29 18:57:38 +02:00
TheBusyBiscuit
fd1a30be82
[Ci skip] Updated change log 2020-09-29 15:51:59 +02:00
TheBusyBiscuit
362b7bda63
Merge branch 'master' into tags 2020-09-28 16:01:30 +02:00
TheBusyBiscuit
35b25636d4
[CI skip] Updated changelog 2020-09-28 15:53:09 +02:00
TheBusyBiscuit
a674a38f2a
Merge branch 'master' into tags 2020-09-28 15:07:29 +02:00
TheBusyBiscuit
1bca830cb0
[CI skip] Updated changelog 2020-09-27 20:13:38 +02:00
TheBusyBiscuit
8365d1e6d9
Merge branch 'master' into tags 2020-09-22 15:33:56 +02:00
TheBusyBiscuit
e0a76fa0e8
[CI skip] Updated changelog 2020-09-22 15:32:06 +02:00
TheBusyBiscuit
4412b40709
Merge branch 'master' into tags 2020-09-21 15:59:08 +02:00
TheBusyBiscuit
a36dfc1151
[CI skip] Updated changelog 2020-09-21 15:47:06 +02:00
TheBusyBiscuit
2f37c2b8b7
Merge branch 'master' into tags 2020-09-21 13:24:44 +02:00
TheBusyBiscuit
5cd1d99b70 Fixes #2322 2020-09-21 13:23:14 +02:00
TheBusyBiscuit
9dfd43fda6 Fixed Climbing Pick having no animation in creative mode 2020-09-21 13:14:56 +02:00
TheBusyBiscuit
cdc495e62b Fixes #2325 2020-09-21 13:09:45 +02:00
TheBusyBiscuit
9547d51db2 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
tags

Conflicts:
	CHANGELOG.md
	src/test/java/io/github/thebusybiscuit/slimefun4/testing/TestUtilities.java
2020-09-19 11:35:41 +02:00
TheBusyBiscuit
917bcce636 Fixed an issue with ChestTerminal 2020-09-18 10:48:36 +02:00
TheBusyBiscuit
2810019dbe Visual improvements + config setting for event calling 2020-09-15 12:08:30 +02:00
TheBusyBiscuit
11c0faf376 Updated changelog 2020-09-15 11:43:05 +02:00
TheBusyBiscuit
5fb1ca2b8e
[CI skip] Updated changelog 2020-09-13 23:38:29 +02:00
TheBusyBiscuit
817ec43153
[CI skip] Updated changelog 2020-09-13 12:38:13 +02:00
TheBusyBiscuit
a770378025 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags 2020-09-13 11:57:11 +02:00
poma123
be5f793695 Fixed a bunch of typos 2020-09-11 20:02:17 +02:00
TheBusyBiscuit
ed66ee9b79 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
tags

Conflicts:
	CHANGELOG.md
2020-09-11 10:33:02 +02:00
TheBusyBiscuit
5989fde476
[CI skip] Updated changelog 2020-09-11 10:21:07 +02:00
TheBusyBiscuit
74edbe499c Fixes #2238 2020-09-11 00:07:26 +02:00
TheBusyBiscuit
a30d41ea9e
[CI skip] Updated change log 2020-09-09 11:31:52 +02:00
TheBusyBiscuit
fe22c5e9ed Fixes #2300 (and deprecated bStats) 2020-09-08 12:06:12 +02:00
TheBusyBiscuit
239df5cc30
[CI skip] Updated change log 2020-09-07 12:45:27 +02:00
TheBusyBiscuit
5c0aba7692 [CI skip] Moved Slimefun repository 2020-09-06 17:19:02 +02:00
TheBusyBiscuit
ff99da0b7d
[Ci skip] Updated change log 2020-09-05 22:15:40 +02:00
TheBusyBiscuit
ec9133cf8a Small improvements 2020-09-05 14:45:42 +02:00
TheBusyBiscuit
c156a317a5 [CI skip] Updated change log 2020-09-03 20:06:53 +02:00
TheBusyBiscuit
dd9962d3e2 Small improvement, many annotations 2020-09-03 12:24:49 +02:00
TheBusyBiscuit
c5630791c0 Added item break sound to some tools 2020-09-02 12:19:18 +02:00
TheBusyBiscuit
7da5b9ad35
Merge branch 'master' into experimental 2020-09-02 10:34:13 +02:00
TheBusyBiscuit
35c1fa6a23 Fixes #2275 2020-09-01 22:38:22 +02:00
TheBusyBiscuit
93ff508603 More refactoring 2020-08-31 20:37:24 +02:00
TheBusyBiscuit
3d22e42bef
Merge pull request #2270 from LinoxGH/master
Fixes #2265 <Tested>
2020-08-31 19:56:05 +02:00
TheBusyBiscuit
8073b5dafb Fixes #2266 2020-08-31 19:49:25 +02:00
LinoxGH
6dba662d4b
Merge branch 'master' into master 2020-08-31 20:34:15 +03:00
TheBusyBiscuit
68b9a0aed8 Fixes #2269 (+ refactoring) 2020-08-31 19:08:15 +02:00
LinoxGH
4346d374d8
Update CHANGELOG.md 2020-08-31 18:57:06 +03:00
LinoxGH
e8498f8c0c
Update CHANGELOG.md 2020-08-30 18:15:59 +03:00
TheBusyBiscuit
d1807bc39f Updated changelog 2020-08-29 14:11:08 +02:00
TheBusyBiscuit
ac5d5521ce Fixes #2260 2020-08-28 23:35:11 +02:00
TheBusyBiscuit
5bef6a9ec8 Fixes #2257 2020-08-28 23:18:43 +02:00
TheBusyBiscuit
9d740436a7
Merge branch 'master' into experimental 2020-08-28 20:53:20 +02:00
TheBusyBiscuit
43ef02d31c
Maybe fixed #2251 (updated changelog) 2020-08-28 20:10:29 +02:00
TheBusyBiscuit
83b66232fa Fixes #2251 2020-08-28 20:03:45 +02:00
TheBusyBiscuit
fcbae02a4b Fixs #2208 2020-08-27 14:16:09 +02:00
TheBusyBiscuit
c8ab9e8568 Fixes #1022 2020-08-26 14:31:51 +02:00
TheBusyBiscuit
6e6a953009 Fixes #2249 2020-08-26 12:47:08 +02:00
TheBusyBiscuit
4bc22ab106 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into experimental

Conflicts:
	CHANGELOG.md
2020-08-24 21:12:04 +02:00
TheBusyBiscuit
b81959e7a0 Added dual-wielding to the Climbing Pick 2020-08-24 20:19:24 +02:00
TheBusyBiscuit
951889c629
[CI skip] Updated change log 2020-08-24 18:09:05 +02:00
TheBusyBiscuit
15626c95f6
[CI skip] Updated change log 2020-08-24 13:27:35 +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
c684ad9249
Update CHANGELOG.md 2020-08-20 18:23:12 +02:00
TheBusyBiscuit
9787cf734b Renamed to Nitwit Rune 2020-08-19 14:31:07 +02:00
TheBusyBiscuit
66fa277014 A few additional changes 2020-08-19 14:07:42 +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
0d27a787ab Added a new config option for setting Players on fire when radioactive 2020-08-17 02:23:59 +02:00
TheBusyBiscuit
7a31c88ce9 Fixes #2207 2020-08-17 00:32:18 +02:00
TheBusyBiscuit
eb5b2678e0 Fixes #2077 2020-08-14 01:46:05 +02:00
TheBusyBiscuit
c0d18c5c89 Fixes #2217 2020-08-13 21:13:19 +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
3e6a9594b5
[CI skip] Updated changelog 2020-08-08 00:09:28 +02:00
TheBusyBiscuit
5002533a65 [CI skip] Updated change log 2020-08-07 19:21:12 +02:00
TheBusyBiscuit
d55a546c42 Fixes #2168 2020-08-06 16:24:41 +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
TheBusyBiscuit
06f64725d9 Improved performance for idling Enhanced Furnaces on Paper 2020-08-04 18:00:31 +02:00
TheBusyBiscuit
a8bb156ac3
Update CHANGELOG.md 2020-08-04 12:49:41 +02:00
TheBusyBiscuit
0ff5fc7251 Small performance improvements for miner talismans 2020-08-04 10:19:24 +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
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
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
TheBusyBiscuit
6dd2129dfe
[CI skip] Updated changelog 2020-08-02 23:13:23 +02:00
TheBusyBiscuit
1389085932 Fixed Reinforced Spawners 2020-08-02 22:01:32 +02:00
TheBusyBiscuit
d20650855c Fixes #2179 2020-08-02 21:45:58 +02: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
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
TheBusyBiscuit
a472097798 Fixed androids rotating to the wrong side 2020-08-01 16:16:15 +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
TheBusyBiscuit
90685edae6 Added a permission node for the debug fish 2020-07-31 01:32:43 +02:00
TheBusyBiscuit
2f05b9e4f8 Various fixes and performance improvements, mainly for talismans 2020-07-30 17:20:21 +02:00
TheBusyBiscuit
77131d8bdb [CI skip] Locked release data for RC 15 2020-07-30 11:36:41 +02:00
TheBusyBiscuit
0412a2aec1 Fixes #2151 2020-07-30 10:23:44 +02:00
TheBusyBiscuit
ac4cfd3d68 Fixes #2145 2020-07-29 21:57:08 +02:00
TheBusyBiscuit
eb8e689d2c Fixes #2143 2020-07-29 13:03:52 +02:00
TheBusyBiscuit
f52866cf1f [CI skip] Updated change log 2020-07-29 12:38:16 +02:00
TheBusyBiscuit
c3ab3a6ecc Fixed Enttiy Assemblers 2020-07-25 14:45:57 +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
da37e78ffc
[CI skip] Updated change log 2020-07-25 13:55:52 +02:00
TheBusyBiscuit
33f7c42e2c Added an option to disable the "Ignoring duplicate block" message 2020-07-25 12:28:04 +02:00
TheBusyBiscuit
499bbdbf70
Merge branch 'master' into experimental 2020-07-24 16:36:08 +02:00
TheBusyBiscuit
cd944e35b8
[CI skip] Updated CHANGELOG 2020-07-24 16:15:43 +02:00
TheBusyBiscuit
d69ef1effb
Merge pull request #2107 from WalshyDev/feature/metrics-module
Metrics!
2020-07-24 16:06:53 +02:00
TheBusyBiscuit
1f7b75b823 Added Iron Golem Assembler (experimental) 2020-07-23 12:02:53 +02: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
TheBusyBiscuit
31e4cfa29b
Merge branch 'master' into feature/metrics-module 2020-07-22 20:43:39 +02:00
TheBusyBiscuit
86c253c929 [CI skip] Updated change log 2020-07-22 15:32:26 +02:00
Daniel Walsh
f632dee560 Modify changelog 2020-07-21 13:59:48 +01:00
TheBusyBiscuit
f1e650b28c
Merge branch 'master' into experimental 2020-07-21 10:18:34 +02:00
TheBusyBiscuit
2d64f37999
Update CHANGELOG.md 2020-07-20 19:33:03 +02:00
TheBusyBiscuit
4e0df92b56 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into experimental

Conflicts:
	CHANGELOG.md
	src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java
	src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java
2020-07-20 12:46:12 +02:00
TheBusyBiscuit
613bcd86b8 Fixes #2093 2020-07-20 12:43:05 +02:00
TheBusyBiscuit
14e062810b Fixes #2075 2020-07-19 10:53:09 +02:00
TheBusyBiscuit
c78e3c3959 Performance improvements for cargo (when ChestTerminals is installed) 2020-07-16 22:41:36 +02:00
TheBusyBiscuit
c574337318 Reworked Energy Providers (Generators) 2020-07-15 13:17:27 +02:00
TheBusyBiscuit
61a56c1ee4
Fixed change log (again) 2020-07-13 17:01:24 +02:00
TheBusyBiscuit
cf89ee1f6f
Fixed change log 2020-07-13 17:00:21 +02:00
TheBusyBiscuit
50c579b7d6 Added a Tape Measure to the experimental branch 2020-07-13 11:55:59 +02:00
TheBusyBiscuit
d4a1501523 Merge branch 'experimental' of
https://github.com/TheBusyBiscuit/Slimefun4 into experimental

Conflicts:
	CHANGELOG.md
2020-07-13 10:42:15 +02:00
TheBusyBiscuit
5c159b4247 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into experimental

Conflicts:
	CHANGELOG.md
	src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java
2020-07-13 10:41:53 +02:00
TheBusyBiscuit
0f7318a749 [CI skip] Removed deprecated classes 2020-07-13 10:36:16 +02:00
TheBusyBiscuit
9af908300f Fixed a NullPointerException for Error-Reports for generators 2020-07-12 13:19:16 +02:00
TheBusyBiscuit
058f34879a Moved the Soulbound Backpack to "Magical Gadgets" 2020-07-10 18:02:51 +02:00
TheBusyBiscuit
f93117ffa3
[CI skip] Set release date for RC-14 2020-07-10 16:49:09 +02:00
TheBusyBiscuit
8fd0afd8bd Fixes #2081 2020-07-09 18:35:48 +02:00
TheBusyBiscuit
d677c29298
Merge branch 'master' into experimental 2020-07-08 13:34:27 +02:00
TheBusyBiscuit
afd63a1f51 Small performance optimization for large Cargo networks 2020-07-06 22:04:32 +02:00
TheBusyBiscuit
613dc7b328
Merge branch 'master' into experimental 2020-07-05 16:54:06 +02:00
TheBusyBiscuit
b243f128de Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-07-05 15:07:32 +02:00
TheBusyBiscuit
098304a1c4 Implemented a texture cache for contributors 2020-07-05 15:07:28 +02:00
TheBusyBiscuit
3408fcf11f Updated assets 2020-07-05 14:39:28 +02:00
TheBusyBiscuit
1dc20e5197
Update CHANGELOG.md 2020-07-05 13:35:39 +02:00
TheBusyBiscuit
e3a920826d One more change 2020-07-05 13:30:13 +02:00
TheBusyBiscuit
b01254eb9d Added Reinforced Cloth 2020-07-05 13:01:17 +02:00
TheBusyBiscuit
4edc557547 Fixed an issue where moving Androids got stuck 2020-07-05 11:46:20 +02:00
TheBusyBiscuit
5a19b18633 Thunderstorms now count as night for Solar Generators (+ other stuff) 2020-07-04 19:04:29 +02:00
TheBusyBiscuit
768e4f1021 Massive performance improvements to Rainbow Glass Panes 2020-07-03 17:43:10 +02:00
TheBusyBiscuit
4ddea8f7ae Small performance improvement 2020-07-02 20:41:40 +02:00
TheBusyBiscuit
8cbaf14d2e Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into feature/profiler

Conflicts:
	CHANGELOG.md
2020-07-02 11:51:38 +02:00
TheBusyBiscuit
548e3586ae Fixes #2066 2020-07-02 11:50:07 +02:00
TheBusyBiscuit
1016b5fc76 Added better summaries, ratings + more performance improvements 2020-07-01 18:20:34 +02:00
TheBusyBiscuit
d82b66a842 Added a better profiler 2020-06-30 19:36:55 +02:00
TheBusyBiscuit
527ffdd742 Added Gilded Blackstone recipe to the Ore Crusher 2020-06-30 02:12:40 +02:00
TheBusyBiscuit
6f1a2b82b5 Added runtime deprecation warnings for Addon Creators 2020-06-29 17:12:54 +02:00
TheBusyBiscuit
3415a124c7 A bunch of refactoring 2020-06-29 15:47:51 +02:00
TheBusyBiscuit
4f2bb90f15 [CI skip] Slight refactoring 2020-06-29 12:10:45 +02:00
TheBusyBiscuit
c5da9a3b4f [CI skip] Updated change log 2020-06-29 03:26:30 +02:00
TheBusyBiscuit
03c08ed6f1 Fixes #2062 2020-06-28 11:20:56 +02:00
TheBusyBiscuit
4314581a61 Another fix and an addition 2020-06-27 14:22:45 +02:00
TheBusyBiscuit
50aaa4b965 Added a few more items to the Bio Generator 2020-06-27 14:04:31 +02:00
TheBusyBiscuit
44c0029587 Fixed a rare concurrency issue with world saving 2020-06-27 02:47:53 +02:00
TheBusyBiscuit
6ffa5ab9a7 Lots of refactoring and rewriting of Item Energy 2020-06-26 15:32:57 +02:00
TheBusyBiscuit
d18af0c211 Ore Crusher now also accepts Nether Gold Ore 2020-06-25 15:27:18 +02:00
TheBusyBiscuit
427a312240 More steps towards 1.16 compatibility (unfinished) 2020-06-25 14:43:17 +02:00
TheBusyBiscuit
c64b311ee2 Finished merge of PR #2015 and updated language keys 2020-06-24 21:25:21 +02:00
TheBusyBiscuit
6840a1e957 Updated assets 2020-06-24 18:57:12 +02:00
TheBusyBiscuit
d3f1dc6fb3 Fixes #1855 plus a few optimizations 2020-06-24 18:50:39 +02:00
TheBusyBiscuit
8d373a3812 Minor changes 2020-06-24 14:54:43 +02:00
TheBusyBiscuit
1c50d29fa8 Added Nether Quartz Ore Crusher Recipe 2020-06-22 22:49:07 +02:00
TheBusyBiscuit
bab94652bc Duplication glitch fix and performance improvements for Rainbow blocks 2020-06-22 22:45:14 +02:00
TheBusyBiscuit
bdb25b74ec Changed the texture of the Nether Star Reactor 2020-06-22 14:22:41 +02:00
TheBusyBiscuit
7d8ef33d78 Changed the texture for the Nuclear Reactor 2020-06-22 12:07:56 +02:00
TheBusyBiscuit
a06e49cf13 Improvements to error logging in world loading 2020-06-22 01:55:11 +02:00
TheBusyBiscuit
8e07ada321 Reduced technical debt / Refactoring 2020-06-21 10:26:54 +02:00
TheBusyBiscuit
24cea8dade Further Improvements on the backwards-compatibility toggle 2020-06-20 21:39:41 +02:00
TheBusyBiscuit
c98aca37f1 Massive Performance improvements to GEO-Miner and Oil Pump 2020-06-20 19:33:37 +02:00
TheBusyBiscuit
4b38dd655d Added ReactorExplodeEvent to the API 2020-06-20 19:21:44 +02:00
TheBusyBiscuit
907fb1566a Fixes #2009 2020-06-20 18:52:30 +02:00
TheBusyBiscuit
1456245ee0 Added a toggle for backwards compatibility 2020-06-20 11:56:29 +02:00
TheBusyBiscuit
7059ad216c Refactoring and general improvements 2020-06-19 13:22:52 +02:00
TheBusyBiscuit
3c3dd48e9b Fixes #2005 2020-06-18 21:15:47 +02:00
TheBusyBiscuit
5c14bc5cbe Refactoring 2020-06-17 01:24:47 +02:00
TheBusyBiscuit
0fd631813b [CI skip] Removed some deprecated stuff 2020-06-16 14:50:03 +02:00
TheBusyBiscuit
6c017b87cf A new update 2020-06-16 14:21:00 +02:00
TheBusyBiscuit
314907eb82 A ton of refactoring 2020-06-16 14:16:21 +02:00
TheBusyBiscuit
ffa3ea1c1b Further improvements to Unit Tests 2020-06-15 15:01:33 +02:00
TheBusyBiscuit
4efc10db15 Fixes #1907 2020-06-15 11:53:38 +02:00
TheBusyBiscuit
c84dd02b39 Fixes #1993 2020-06-14 19:28:51 +02:00
TheBusyBiscuit
4855f0da86 Androids now have a seperate category 2020-06-14 18:58:38 +02:00
TheBusyBiscuit
2bead0cd3d Maybe fixes #1951 2020-06-14 13:34:31 +02:00
TheBusyBiscuit
2733b8a17b Fixes #1992 and changes to the fishing loot for androids 2020-06-14 13:01:38 +02:00
TheBusyBiscuit
85af23c17c Fixes #1988 2020-06-14 02:36:32 +02:00
TheBusyBiscuit
debc925bd0 Fixes #1976 2020-06-13 21:24:28 +02:00
TheBusyBiscuit
c5cc2a86ff [CI skip] Refactoring and optimizations 2020-06-11 13:50:22 +02:00
TheBusyBiscuit
25d970ea94 Fixes #1971 2020-06-11 09:34:29 +02:00
TheBusyBiscuit
f58d6aeff4 Small performance improvement 2020-06-11 00:43:17 +02:00
TheBusyBiscuit
7acee959ce Lots of refactoring 2020-06-10 23:33:51 +02:00
TheBusyBiscuit
013696a759
Merge branch 'master' into feature/miner 2020-06-09 00:12:33 +02:00
TheBusyBiscuit
abe8afab67 More balancing for Organic Food/Fertilizer 2020-06-08 23:25:45 +02:00
TheBusyBiscuit
bd712472d5 Balancing changes to Organic Food/Fertilizer, added cocoa variant 2020-06-08 23:13:44 +02:00
TheBusyBiscuit
fb58b5cf33 Updated changelog 2020-06-05 14:14:13 +02:00
TheBusyBiscuit
c8f78379a1 Added Industrial Miner 2020-06-05 00:00:07 +02:00
TheBusyBiscuit
7e8a63bff8 Dried Kelp Blocks are now valid coal generator fuel 2020-06-04 15:26:35 +02:00
TheBusyBiscuit
595767ad03 Some cleanup 2020-06-02 13:50:29 +02:00
TheBusyBiscuit
0faaef9b25 Removed Digital Miners 2020-06-01 14:10:22 +02:00
TheBusyBiscuit
f65ac6b68c Lava can no longer be used as a coolant for reactors 2020-06-01 14:02:49 +02:00
TheBusyBiscuit
4bb81c0f5f Updated changelog 2020-05-31 00:38:19 +02:00
TheBusyBiscuit
c85b29c009 Fixes #1943 2020-05-30 16:21:13 +02:00
TheBusyBiscuit
343a18a95d Added dried Kelp and bone block recipes to the Electric Press 2020-05-30 13:36:48 +02:00
TheBusyBiscuit
d19da209d5 Fixes #1942 2020-05-29 16:07:02 +02:00
TheBusyBiscuit
efd9903ace [CI skip] Refactoring 2020-05-29 12:07:24 +02:00
TheBusyBiscuit
9ec316981c [CI skip] Updated README and changelog 2020-05-26 10:02:16 +02:00
TheBusyBiscuit
a34abcb1e7 Some refactoring, also fixes #1935 2020-05-24 20:19:22 +02:00
TheBusyBiscuit
f38c895780 [CI skip] Updated MockBukkit and re-enabled Deathpoint tests 2020-05-24 19:12:45 +02:00
TheBusyBiscuit
23c2ab0f65 Fixed custom player heads errors 2020-05-24 01:57:38 +02:00
TheBusyBiscuit
0af8c41eeb Added a toggle for #1924 and fixes #1933 2020-05-24 01:11:10 +02:00
TheBusyBiscuit
323ddc949b Fixes #1926 2020-05-23 20:34:37 +02:00
TheBusyBiscuit
69d32bd6f2 Fixes TheBusyBiscuit/ChestTerminal#25 2020-05-21 18:51:53 +02:00
TheBusyBiscuit
6eebb9c04d AncientAltar now has a speed variable 2020-05-17 00:40:07 +02:00
TheBusyBiscuit
dec22b9960 Added WaypointCreateEvent 2020-05-16 17:51:42 +02:00
TheBusyBiscuit
3a2cced5d0 Infused Magnets can no longer be placed down 2020-05-16 17:04:16 +02:00
TheBusyBiscuit
6a27bfd629 [CI skip] Updated the pom slightly 2020-05-16 16:12:30 +02:00
TheBusyBiscuit
29d2aaf055 Fixes #1914 2020-05-16 12:42:46 +02:00
TheBusyBiscuit
13b1a7f947 Fixed some weird head issues 2020-05-16 12:32:56 +02:00
TheBusyBiscuit
c4012fe697 [ci skip] Reduced mojang.com connection errors 2020-05-16 12:04:19 +02:00
TheBusyBiscuit
11383cad1d Fixes #1829 2020-05-15 17:45:13 +02:00
TheBusyBiscuit
6553aeb3e1 Fixes #1883 2020-05-15 16:57:47 +02:00
TheBusyBiscuit
c4a3cdc833 Fixed Organic food/fertilizer not being recognized 2020-05-15 16:47:01 +02:00
TheBusyBiscuit
741d18a8e8 Fixes #1903 2020-05-15 00:36:39 +02:00
TheBusyBiscuit
886121e226 Fixes #1908 2020-05-14 20:07:18 +02:00
TheBusyBiscuit
471a271518 Another one bites the Unit Tests 2020-05-12 00:50:01 +02:00
TheBusyBiscuit
ccad2982ab Fixes #1897 2020-05-10 21:37:24 +02:00
TheBusyBiscuit
eacbd2c5c1 Refactored Talismans a bit 2020-05-10 10:31:28 +02:00
TheBusyBiscuit
da95bb832d Fixes #1891 (actually fixed in a commit before the issue was posted) 2020-05-09 18:10:04 +02:00
TheBusyBiscuit
a2512ce03a Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into tests 2020-05-08 16:00:31 +02:00
TheBusyBiscuit
c3dbe8f34a Maybe fixed the Electric Smeltery recipe priorities 2020-05-08 15:54:14 +02:00
TheBusyBiscuit
a3afe615b5 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into tests 2020-05-07 20:39:42 +02:00
TheBusyBiscuit
528edc80d0 Fixes #1873 2020-05-07 20:38:51 +02:00
TheBusyBiscuit
220d5ef41f Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into tests

Conflicts:
	CHANGELOG.md
2020-05-07 18:18:09 +02:00
TheBusyBiscuit
e95c5939a3 [CI skip] Added Ukrainian language 2020-05-04 21:21:01 +02:00
TheBusyBiscuit
0e58c3fa35 Added first Unit Tests 2020-05-04 16:25:47 +02:00
TheBusyBiscuit
3e2d1847ed Little performance improvement 2020-05-03 18:36:29 +02:00
TheBusyBiscuit
b9f22fbe2a [CI skip] Minor changes 2020-05-02 19:07:31 +02:00
TheBusyBiscuit
085d10be0a Maybe resolves #1834 2020-05-01 11:25:42 +02:00
TheBusyBiscuit
8cb5579a12 Fixes #1833 2020-04-30 20:51:17 +02:00
TheBusyBiscuit
2b9d109d16 Bandages, Rags and Splints will no longer be consumed if at full health 2020-04-26 16:08:01 +02:00
TheBusyBiscuit
9eb9a98410 Fixes #1824 2020-04-25 19:14:50 +02:00
TheBusyBot
9e80e55ada [CI skip] Updated Changelog 2020-04-25 10:07:59 +00:00
TheBusyBiscuit
90812f7828 [CI skip] Updated README 2020-04-25 12:07:36 +02:00
TheBusyBiscuit
45ed89c6f5 Bugged Generators from Addons will no longer destroy Energy Regulators 2020-04-25 02:16:21 +02:00
TheBusyBiscuit
0116d19f33
[CI skip] Updated change log for new release 2020-04-24 12:48:27 +02:00
TheBusyBiscuit
d896462c2d Fixed Emergency Transmitters + Reduced technical debt 2020-04-23 18:08:15 +02:00
TheBusyBiscuit
a04676b27c Various improvements, including Pull Request #1790 2020-04-23 13:01:47 +02:00