mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity
6,173 Commits 1 Branch 0 Tags 64 MiB
aa349ccd0f
Commit Graph

600 Commits

Author SHA1 Message Date
TheBusyBiscuit
aa349ccd0f Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into feature/auto-crafters 2021-03-14 14:29:30 +01:00
TheBusyBiscuit
6e4a1ccf5f [CI skip] Removed temporary redirects 2021-03-14 13:34:17 +01:00
TheBusyBiscuit
51d0435718
Trigger another build... 
Previous one failed due to some maven repository issues. This is always fun.
 2021-03-14 11:28:52 +01:00
TheBusyBiscuit
e39c2b661c Fixes #2883 2021-03-14 11:02:47 +01:00
TheBusyBiscuit
fbd701bced Fixed Mining Androids and improved itemsettings API 2021-03-13 21:56:54 +01:00
TheBusyBiscuit
a3ecde181e Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into feature/auto-crafters 2021-03-13 10:59:57 +01:00
TheBusyBiscuit
4aec2ffbcf Fixes #2878 2021-03-13 00:18:02 +01:00
TheBusyBiscuit
5d4412d3cd
[CI skip] Updated changelog 2021-03-11 11:15:23 +01:00
TheBusyBiscuit
f0b5e8463f
[CI skip] Updated changelog 2021-03-11 02:22:02 +01:00
Daniel Walsh
4b5ad219ec
Merge pull request #2328 from Slimefun/performance/cobblestone 
This totally wasn't sitting fully approved for 16 days 👀
 2021-03-11 00:52:41 +00:00
TheBusyBiscuit
4678de1697 Fixes #2877 and added a new config option to crucibles 2021-03-10 14:04:33 +01:00
TheBusyBiscuit
86edb0df6a Fixes #2876 2021-03-10 13:36:28 +01:00
TheBusyBiscuit
0fa862314f Fixes #2856 2021-03-10 00:49:53 +01:00
TheBusyBiscuit
bef0cfb413 Fixed #2861 2021-03-10 00:24:05 +01:00
TheBusyBiscuit
717e8c84a0 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
feature/auto-crafters

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/BookBinder.java
 2021-03-09 16:44:54 +01:00
TheBusyBiscuit
3bef3b1e73 [CI skip] Updated changelog 2021-03-05 09:58:35 +01:00
TheBusyBiscuit
8c1c67731b Fixes #2852 2021-03-01 09:31:59 +01:00
TheBusyBiscuit
51b56b1e0b Fixes #2851 2021-03-01 09:30:38 +01:00
TheBusyBiscuit
84ad08be37 Fixes #2849 2021-02-27 10:19:19 +01:00
TheBusyBiscuit
c4be51f7bb Fixes #2839 2021-02-24 15:57:21 +01:00
TheBusyBiscuit
659f329349
Merge branch 'master' into feature/auto-crafters 2021-02-23 11:11:26 +01:00
TheBusyBiscuit
acde60a01b [CI skip] Updated changelog 2021-02-23 11:05:29 +01:00
TheBusyBiscuit
d73e96cff7 [CI skip] Updated changelog 2021-02-23 11:02:26 +01:00
TheBusyBiscuit
338fe0f84b
Merge pull request #2597 from Slimefun/fixes/blocks fixes #2560 
Refactoring + Fixes to Block Handlers
 2021-02-22 18:34:19 +01:00
TheBusyBiscuit
2754703f9d
Merge branch 'master' into feature/auto-crafters 2021-02-10 18:34:34 +01:00
TheBusyBiscuit
854c3335e9 Fixes #2818 2021-02-10 18:33:34 +01:00
TheBusyBiscuit
e2f3944d66 Fixes #2817 2021-02-09 17:08:49 +01:00
TheBusyBiscuit
b224123918 Fixes #2804 2021-02-07 18:26:08 +01:00
TheBusyBiscuit
e47d0171cc Fixes #2810 2021-02-07 12:30:55 +01:00
TheBusyBiscuit
9e83b4af00 Fixes #2809 2021-02-06 20:23:32 +01:00
TheBusyBiscuit
7ddd0469eb Deprecated Automated Crafting Chamber (soon to be replaced) 2021-02-06 19:32:41 +01:00
TheBusyBiscuit
a5a16621ee
Merge branch 'master' into feature/auto-crafters 2021-02-06 11:19:07 +01:00
TheBusyBiscuit
47743b632e Fixed an exception when disabled in an invalid environment. 2021-02-06 11:18:09 +01:00
TheBusyBiscuit
7d50d0eb32 Fixes #1161 2021-02-05 18:40:41 +01:00
TheBusyBiscuit
3544f56f73 Updated changelog 2021-02-05 15:18:48 +01:00
TheBusyBiscuit
fe2e5c1444
Update CHANGELOG.md 2021-02-02 18:34:05 +01:00
Daniel Walsh
b74eb5b30d
Merge pull request #2782 from Slimefun/feature/taisman-actionbar 
Allow Talismans to use the Actionbar
 2021-02-02 17:27:47 +00:00
TheBusyBiscuit
6d89d38c3a Fixes #2793 2021-02-02 10:05:08 +01:00
TheBusyBiscuit
e99a39d2ab Fixes #2794 2021-02-02 09:39:22 +01:00
TheBusyBiscuit
fe42f6fa9f Nether Wart Blocks can be turned into Nether Warts using a Grind Stone 2021-02-01 10:47:31 +01:00
TheBusyBiscuit
5aaed5d814
[CI skip] Updated changelog 2021-01-30 13:14:27 +01:00
TheBusyBiscuit
c523fc279f
[CI skip] Updated changelog 2021-01-29 16:34:32 +01:00
TheBusyBiscuit
ee7786b8e4 Allow Talismans to use the Actionbar 2021-01-29 03:02:50 +01:00
TheBusyBiscuit
8cf0f61f3e Added placeholder for unloaded profiles to PlaceholderAPI integration 2021-01-28 18:21:22 +01:00
TheBusyBiscuit
2d244420a9 [CI skip] Added a release date 2021-01-28 14:51:02 +01:00
TheBusyBiscuit
cadf66a13c
Merge branch 'master' into fixes/blocks 2021-01-28 13:41:27 +01:00
TheBusyBiscuit
6df052e4cf Fixes #2771 2021-01-28 12:37:13 +01:00
TheBusyBiscuit
7ffc8aff24 Fixes #2760 2021-01-26 10:35:47 +01:00
TheBusyBiscuit
9436ce451a Fixes #2460 2021-01-26 10:07:12 +01:00
TheBusyBiscuit
2085d9eeba [CI skip] Updated changelog 2021-01-26 00:56:03 +01:00