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
8,372 Commits 1 Branch 0 Tags 64 MiB
master
Commit Graph

842 Commits

Author SHA1 Message Date
TheBusyBiscuit
31af8f3b25 Fixed #3053 2021-05-24 13:04:45 +02:00
TheBusyBiscuit
fd2d30a3ae Validate progress arguments 2021-05-24 11:23:36 +02:00
TheBusyBiscuit
a249ca7848 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into api/machine-operations 2021-05-24 11:09:52 +02:00
TheBusyBiscuit
e4225d7aec Fixed a permissions issue with /sf charge 2021-05-19 17:36:10 +02:00
TheBusyBiscuit
aca9fd7dfd
[CI skip] Updated changelog 2021-05-19 17:24:59 +02:00
TheBusyBiscuit
a1116ec75e
[CI skip] Updated changelog 2021-05-19 14:02:57 +02:00
TheBusyBiscuit
d9cb5ef0ba
[CI skip] Updated changelog 2021-05-19 10:38:31 +02:00
TheBusyBiscuit
5b8440daca
[CI skip] Updated changelog 2021-05-16 21:52:27 +02:00
TheBusyBiscuit
2061891984
[CI skip] Updated changelog 2021-05-15 12:42:09 +02:00
TheBusyBiscuit
31a81d0d7e
[CI skip] Updated changelog 2021-05-12 12:39:35 +02:00
TheBusyBiscuit
c9596b8aaf
[CI skip] Updated changelog 2021-05-11 14:13:30 +02:00
TheBusyBiscuit
5620528c1d [CI skip] Updated changelog and workflows 2021-05-10 23:18:36 +02: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
TheBusyBiscuit
2ad96fe9dd Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into api/machine-operations 2021-05-10 10:51:50 +02:00
TheBusyBiscuit
7a06dc3064
Merge pull request #3003 from Slimefun/fix/hologram-dupes 
Potentially fixed #2927
 2021-05-09 17:04:29 +02:00
TheBusyBiscuit
9b3cce1cd1
[CI skip] Updated changelog 2021-05-09 16:02:18 +02:00
TheBusyBiscuit
dc34ec8dfc
Merge branch 'master' into performance/networks 2021-05-07 14:15:30 +02:00
TheBusyBiscuit
295d3dae76
[CI skip] Updated changelog 2021-05-07 14:13:15 +02:00
TheBusyBiscuit
9f9ae687a7
[CI skip] Updated changelog 2021-05-07 14:10:54 +02:00
TheBusyBiscuit
81bf67b72c
Merge branch 'master' into fix/hologram-dupes 2021-05-04 10:08:49 +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
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
5f1aeecdbf [CI skip] Updated changelog 
Also fixed MultiCategory not respecting guide main page index.
 2021-04-30 12:51:22 +02:00
TheBusyBiscuit
5f3ca6eb8e
[CI skip] Updated changelog 2021-04-30 12:36:30 +02:00
TheBusyBiscuit
7c0b29f866
Merge branch 'master' into api/machine-operations 2021-04-30 10:13:25 +02:00
TheBusyBiscuit
c215940cb9 Marked some items as unplaceable 2021-04-29 21:18:32 +02:00
TheBusyBiscuit
90c8e2f278 Fixes #2999 2021-04-29 17:52:21 +02:00
TheBusyBiscuit
57df9e8df9 Refactoring and documentation 2021-04-27 16:59:39 +02:00
Daniel Walsh
46c7328603
Update changelog per #2911 2021-04-26 14:21:23 +01:00
TheBusyBiscuit
a7835197a5 Some minor code improvements 2021-04-25 20:13:51 +02:00
TheBusyBiscuit
d91d9c2856 Removed Automated Crafting Chamber 2021-04-25 19:49:17 +02:00
TheBusyBiscuit
bffef56407 Added Category#setTier() 2021-04-25 19:47:58 +02:00
TheBusyBiscuit
c975fe234e Fixed #2989 2021-04-25 19:29:57 +02:00
TheBusyBiscuit
8dce87cca0
[CI skip] Updated changelog 2021-04-24 13:40:19 +02:00
TheBusyBiscuit
02ba30c226
Updated changelog to include new features 
Tier 2 Auto-Enchanter, Tier 2 Auto-Disenchanter
 2021-04-23 13:51:42 +02:00
TheBusyBiscuit
a18a095722
[CI skip] Updated changelog 2021-04-23 13:46:16 +02:00
TheBusyBiscuit
c1cb7d5213 [CI skip] Updated README and CHANGELOG 2021-04-19 10:36:25 +02:00
TheBusyBiscuit
b20353557f Photovoltaic Cells can no longer be placed 2021-04-18 10:11:32 +02:00
TheBusyBiscuit
f91481db1c Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 
Conflicts:
	CHANGELOG.md
 2021-04-17 09:51:24 +02:00
TheBusyBiscuit
f3765ba7c7
Merge pull request #2956 from Slimefun/fix/2942 
Fixes #2942
 2021-04-17 09:46:35 +02:00
TheBusyBiscuit
2adedd2c76
[CI skip] Ffs, what is wrong with my keyboard 2021-04-17 09:45:22 +02:00
TheBusyBiscuit
34c3593e86
[CI skip] forgot one 2021-04-17 09:44:52 +02:00
TheBusyBiscuit
c6ad928a24
[CI skip] +1 2021-04-17 09:44:29 +02:00
TheBusyBiscuit
d2e17af2a1 Removed SlimefunBlockHandler 2021-04-16 15:05:39 +02:00
TheBusyBiscuit
c3028058c0 [CI skip] Updated changelog 2021-04-16 14:56:08 +02:00
TheBusyBiscuit
aa85388480 Renamed Solar Panel to Photovoltaic Cell 2021-04-16 14:55:49 +02:00
Daniel Walsh
6c6acacd54
Changelog 2021-04-14 12:32:00 +01:00
TheBusyBiscuit
dcc9e97509
[CI skip] Lock release date for RC-22 2021-04-13 19:22:34 +02:00
Daniel Walsh
74333e9d40
Update changelog 2021-04-10 16:29:28 +01:00
TheBusyBiscuit
5c772c87b2
[CI skip] Updated changelog 2021-04-10 15:08:27 +02:00
TheBusyBiscuit
b4b0636cd7 Added magma cream/block to slime ball/block recipes to Freezer 2021-04-09 19:06:19 +02:00
TheBusyBiscuit
2ef332a003 Lowered "Magma block -> Sulfate" recipe to only require 1 magma block 2021-04-09 18:54:16 +02:00
TheBusyBiscuit
dbda4d0b23 Added a deprecation warning to the SlimefunBlockHandler 
Also converted the remaining machines to the new system
 2021-04-09 18:30:27 +02:00
TheBusyBiscuit
e52b1a92c7 Fixes #2944 2021-04-07 16:34:39 +02:00
TheBusyBiscuit
3f5b9a6c11 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2021-04-05 13:45:34 +02:00
TheBusyBiscuit
b106592ab8
Update CHANGELOG.md 2021-04-05 13:23:15 +02:00
TheBusyBiscuit
96f657f6e7 Small performance improvements 2021-04-05 13:16:31 +02:00
NatsuHana
8c6bb68103
Resolves request 2021-04-05 09:28:19 +08:00
NatsuHana
a18ee91dd4
docs: add missing changelog 2021-04-05 00:19:33 +08:00
TheBusyBiscuit
18139bb5c4 Fixed Grappling Hook vanishing in creative mode 2021-04-03 14:08:21 +02:00
TheBusyBiscuit
5e87df873c Fixes #2926 2021-04-03 14:01:48 +02:00
TheBusyBiscuit
5b517ea1b1
[CI skip] Updated changelog 2021-04-03 13:32:25 +02:00
TheBusyBiscuit
ee8d421189 Ancient Pedestals can now be found under "Magical Gadgets" 2021-03-31 19:13:21 +02:00
TheBusyBiscuit
ca3715a0dc Added Crafting Motor (crafting ingredient for Auto-Crafters) 
Also retextured the Cargo Motor
 2021-03-31 19:02:34 +02:00
TheBusyBiscuit
816cc0613b Added "Slimeballs -> Slime Block" recipe to Electric Press 2021-03-31 18:31:59 +02:00
TheBusyBiscuit
5ce2283141
[CI skip] Updated changelog 2021-03-31 17:20:18 +02:00
TheBusyBiscuit
fb8c2ede7f
Merge branch 'master' into fix/issue-2650 2021-03-28 14:47:47 +02:00
Daniel Walsh
1b15e04782
This damn changelog 2021-03-28 13:45:02 +01:00
TheBusyBiscuit
95a2d9e385 Fixed Multimeter not working on Auto-Crafters 2021-03-28 14:18:43 +02:00
TheBusyBiscuit
0dc1ac3894 Added Produce Collector to automate Milk and Mushroom Stew 
Also fixed Auto Crafters not handling milk buckets properly
And allowed Block Placers to place down cakes
 2021-03-28 01:40:19 +01:00
Daniel Walsh
cb2052ec93
Fixes #2914 2021-03-27 22:52:14 +00:00
TheBusyBiscuit
fd16306b61 Auto-Crafters can now be turned on and off via the gui 2021-03-27 22:26:15 +01:00
TheBusyBiscuit
235d3f4d57 Added Auto-Crafter for the Armor Forge 2021-03-27 18:58:31 +01:00
TheBusyBiscuit
70db23bdc5 Fixes #2913 2021-03-27 18:36:30 +01:00
TheBusyBiscuit
090a0f7791 Merge branch 'chore/cleanup-deprecated-crafter' 2021-03-27 11:52:54 +01:00
TheBusyBiscuit
ba984728e7 Added "Netherite Ingot -> Netherite Block" recipe to Electric Press 2021-03-26 20:58:22 +01:00
TheBusyBiscuit
f4bded9491 Added "Smart-Filling" mode to Cargo Input Nodes 2021-03-25 18:39:07 +01:00
TheBusyBiscuit
cc421e7e33 Fixes #2906 2021-03-25 13:59:57 +01:00
TheBusyBiscuit
e3171b37dc Merge branch 'chore/cleanup-deprecated-crafter' 2021-03-22 19:20:18 +01:00
TheBusyBiscuit
e277732608 Fixes #2899 2021-03-22 15:43:20 +01:00
TheBusyBiscuit
328f9d3331 [CI skip] Automated Crafting Chambers will no longer work. 2021-03-22 10:23:54 +01:00
TheBusyBiscuit
13355c1afe Fixes #2896 2021-03-22 10:04:57 +01:00
TheBusyBiscuit
001e7654aa Fixed #2895 2021-03-21 20:06:46 +01:00
TheBusyBiscuit
0803529176
Merge pull request #2807 from Slimefun/feature/auto-crafters 
Added Vanilla Auto-Crafter and Enhanced Auto-Crafter
 2021-03-21 18:44:42 +01:00
TheBusyBiscuit
8161b9ee6d Fixed Enhanced Furnace not dropping any items when broken 2021-03-19 00:39:41 +01:00
TheBusyBiscuit
320ee27b3d
Merge branch 'master' into feature/auto-crafters 2021-03-17 10:54:37 +01:00
TheBusyBiscuit
4531d2d142
[CI skip] Updated changelog 2021-03-17 10:53:30 +01:00
TheBusyBiscuit
79e40e1480 Pulled latest changes from 'master' 2021-03-14 14:30:19 +01:00
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
TheBusyBiscuit
8d85ce2720
Update CHANGELOG.md 2021-01-25 16:46:52 +01:00
TheBusyBiscuit
3e5926c5c2
Update CHANGELOG.md 2021-01-25 16:36:24 +01:00
TheBusyBiscuit
0b4c2f2e08 Cherry-picked Talisman of the Wise from #2645 2021-01-24 18:04:52 +01:00
TheBusyBiscuit
17fd2ec570 Added AsyncProfileLoadEvent 2021-01-23 19:38:59 +01:00
TheBusyBiscuit
389a2978c0 Fixes #2754 2021-01-23 14:25:10 +01:00
TheBusyBiscuit
123eb350a0
Update CHANGELOG.md 2021-01-22 13:03:09 +01:00
TheBusyBiscuit
2519df55cc
[CI skip] Updated changelog 2021-01-21 15:56:36 +01:00
TheBusyBiscuit
570c981de3
Merge branch 'master' into fixes/blocks 2021-01-20 17:19:18 +01:00
svr333
ffef8350b1
Merge branch 'master' into performance/cobblestone 2021-01-18 22:18:02 +01:00
TheBusyBiscuit
7eff4d381e Fixed a small issue with backpacks 2021-01-17 14:27:01 +01:00
TheBusyBiscuit
16ed670573 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
refactoring/holograms

Conflicts:
	CHANGELOG.md
 2021-01-16 15:56:23 +01:00
TheBusyBiscuit
0feace9c06
Merge pull request #2729 from Slimefun/fix/infused-hopper-picking-up-incorrect-items 
Fix the infused hopper picking up items with pickup delay Short.MAX_VALUE
 2021-01-16 15:51:17 +01:00
TheBusyBiscuit
03b4c10bad [CI skip] Updated changelog 2021-01-16 14:46:00 +01:00
TheBusyBiscuit
34d18c5547
Merge branch 'master' into refactoring/holograms 2021-01-16 11:34:24 +01:00
Daniel Walsh
55d2f82dcd
Merge branch 'master' into fix/infused-hopper-picking-up-incorrect-items 2021-01-16 10:33:16 +00:00
TheBusyBiscuit
7c929a2f22 Fixes #2728 2021-01-16 11:30:39 +01:00
Daniel Walsh
5c2a2faa79
Add to changelog 2021-01-16 10:30:31 +00:00
TheBusyBiscuit
e523d7849e Fixes #2662 2021-01-16 11:28:38 +01:00
TheBusyBiscuit
a810458345 [CI skip] Small changes 2021-01-15 11:46:40 +01:00
TheBusyBiscuit
3663a7d43b Proper error handling and updated changelog 2021-01-15 03:31:33 +01:00
TheBusyBiscuit
ac590fdde3 Fixes #2721 2021-01-14 14:41:09 +01:00
TheBusyBiscuit
ae4e4bed73
Merge branch 'master' into fixes/blocks 2021-01-14 12:35:57 +01:00
TheBusyBiscuit
7826b2359a Finished fix for #2636 and fixed a threading issue with BlockStates 2021-01-14 11:58:52 +01:00
TheBusyBiscuit
43109ab2d3
Merge branch 'master' into performance/cobblestone 2021-01-14 11:16:39 +01:00
Daniel Walsh
9be11921c7
Merge branch 'master' into fixes/blocks 2021-01-13 18:50:06 +00:00
TheBusyBiscuit
d8004510e5
Updated changelog (fixed two bugs) 2021-01-13 19:48:30 +01:00
TheBusyBiscuit
c92ba89d9a
Merge branch 'master' into performance/cobblestone 2021-01-11 13:58:21 +01:00
TheBusyBiscuit
3777b59596
Merge branch 'master' into fixes/blocks 2021-01-11 13:57:33 +01:00
TheBusyBiscuit
5ed452660f Fixed elevator order (highest floor first) 2021-01-11 13:07:46 +01:00
TheBusyBiscuit
7a4712f930 Removed obsolete things 2021-01-11 12:33:49 +01:00
TheBusyBiscuit
32474a588b Added ElevatorFloor class from PR #2699 2021-01-11 10:56:46 +01:00
TheBusyBiscuit
577ad2c308 [CI skip] Prepare RC-19 2021-01-11 10:33:12 +01:00
TheBusyBiscuit
7e48d96fa3 Removed "written book" slimefun guide and disabled elevators 2021-01-11 02:39:54 +01:00
TheBusyBiscuit
2943289c6d
Merge branch 'master' into fixes/blocks 2021-01-10 23:12:34 +01:00
TheBusyBiscuit
4c879ac3b3 Added AndroidFarmEvent (+ refactored Farmer Androids) 2021-01-10 21:20:43 +01:00
TheBusyBiscuit
22b5421118 Fixed /sf timings --verbose not working correctly (+refactoring) 2021-01-10 13:38:07 +01:00
TheBusyBiscuit
e36027fb48
Merge branch 'master' into fixes/blocks 2021-01-06 21:06:26 +01:00
TheBusyBiscuit
e773e68b4a
Merge branch 'master' into performance/cobblestone 2021-01-06 20:24:54 +01:00
TheBusyBiscuit
75b72eb630 Removed deprecated stuff 2021-01-06 16:26:40 +01:00
TheBusyBiscuit
f602b0436b
[CI skip] Updated changelog 2021-01-03 19:50:39 +01:00
TheBusyBiscuit
f2dd3a0125 Fixes #2655 2020-12-31 17:38:51 +01:00
TheBusyBiscuit
aa98bd0ba2 Fixes #2664 2020-12-31 17:08:50 +01:00
TheBusyBiscuit
43af06f888
[CI skip] Updated changelog 2020-12-24 02:27:41 +01:00
TheBusyBiscuit
0d5527793c
[CI skip] Updated changelog 2020-12-20 23:56:00 +01:00
TheBusyBiscuit
8c8685b6de
Merge branch 'master' into fixes/blocks 2020-12-17 15:35:57 +01:00
TheBusyBiscuit
2ced45b485
Merge pull request #2609 from Slimefun/refactoring/third-party-integrations 
Refactored integrations (+ Fixed #2575)
 2020-12-17 15:30:16 +01:00
TheBusyBiscuit
3d54080001 [CI skip] A bit o refactoring 2020-12-12 14:00:11 +01:00
TheBusyBiscuit
3c72abad7b
Merge branch 'master' into fixes/blocks 2020-12-10 22:05:25 +01:00
Senne Van Rompaey
3acd6926ad
Merge branch 'master' into refactoring/third-party-integrations 2020-12-10 22:02:21 +01:00
TheBusyBiscuit
8b45a8a009
[CI skip] Updated changelog 2020-12-10 21:50:36 +01:00
TheBusyBiscuit
eac09eea9e Switched to BlockFormEvent 2020-12-10 12:11:25 +01:00
TheBusyBiscuit
b07a54d515 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into performance/cobblestone 2020-12-10 12:04:48 +01:00
TheBusyBiscuit
f0f545dd9f
Fixed changelog 2020-12-10 00:23:00 +01:00
TheBusyBiscuit
36be4c29de More refactoring 2020-12-09 13:33:34 +01:00
TheBusyBiscuit
c84200d2c4 Some stuff + fixes #2560 2020-12-05 13:54:46 +01:00
TheBusyBiscuit
282367d6ff [CI skip] Removed an old version of bStats 2020-12-03 15:51:17 +01:00
TheBusyBiscuit
761126c673
[CI skip] Updated changelog 2020-12-03 15:40:24 +01:00
TheBusyBiscuit
e717b77ddc [CI skip] Might as well push this today 2020-12-03 15:28:58 +01:00