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
6951251394 Some additional cleanup 2021-09-03 14:01:55 +02:00
TheBusyBiscuit
72cbdf8bcc
Merge branch 'master' into breaking-changes/class-relocation 2021-09-02 17:28:31 +02:00
TheBusyBiscuit
d2fe1c3d67
[CI skip] Updated changelog 2021-09-02 17:15:03 +02:00
Daniel Walsh
43280f9801
Update CHANGELOG 2021-09-02 14:29:46 +01:00
TheBusyBiscuit
c5f365f9ad
[CI skip] Updated changelog 2021-08-17 23:23:33 +02:00
TheBusyBiscuit
850f9e2b74
[CI skip] Updated changelog 2021-08-05 10:04:30 +02:00
TheBusyBiscuit
e184836cba
[CI skip] Updated changelog 2021-08-01 10:24:51 +02:00
TheBusyBiscuit
4b43cd6eaa Fixed Auto-Disenchanter exploit using mcMMO's "super ability" tools 2021-07-31 12:27:42 +02:00
TheBusyBiscuit
3aa8d0c25c
[CI skip] Updated changelog 2021-07-26 20:57:40 +02:00
TheBusyBiscuit
aa119e777a
[CI skip] Updated changelog 2021-07-26 16:55:34 +02:00
TheBusyBiscuit
74bcd945fe
[CI skip] Updated changelog 2021-07-26 12:50:35 +02:00
TheBusyBiscuit
55bbe05961 Fixed unbreakable Flint and Steel still being damaged in Smeltery 2021-07-25 23:41:47 +02:00
TheBusyBiscuit
e31ea4f404 Fixed #3177 2021-07-25 15:03:32 +02:00
TheBusyBiscuit
8d7cf3261b
[Ci skip] Updated changelog 2021-07-24 18:54:49 +02:00
TheBusyBiscuit
d5e4149b4f
[Ci skip] New changelog cycle 2021-07-20 10:39:11 +02:00
TheBusyBiscuit
84ceac91bd
[CI skip] Updated changelog 2021-07-20 10:05:49 +02:00
TheBusyBiscuit
9f1db49c67
[CI skip] Updated changelog 2021-07-17 19:06:20 +02:00
TheBusyBiscuit
b5c2732c2c
[CI skip] Updated changelog 2021-07-12 12:26:08 +02:00
TheBusyBiscuit
ad2e0f3dbc
[CI skip] Updated changelog 2021-07-10 12:33:11 +02:00
TheBusyBiscuit
5279ddc67b
[CI skip] Updated changelog 2021-07-09 12:13:25 +02:00
TheBusyBiscuit
5a1442f13a Added SlimefunItemSpawnEvent and ItemSpawnReason 
This allows other plugins to provide compatibility in some places
 2021-07-08 11:17:56 +02:00
TheBusyBiscuit
56a70e66bc
[CI skip] Updated changelog 2021-07-08 10:42:10 +02:00
TheBusyBiscuit
9cd221a67a
[CI skip] Fixed typo 2021-07-05 15:14:18 +02:00
TheBusyBiscuit
e0179dbfc7
[CI skip] Updated changelog 2021-07-05 15:14:00 +02:00
TheBusyBiscuit
beb955a507
[CI skip] Update changelog 2021-06-30 23:35:02 +02:00
TheBusyBiscuit
25dea3daf6 Fixed #2966 
This fix was salvaged from PR #2968
 2021-06-26 00:21:01 +02:00
TheBusyBiscuit
b9f64bdebc Deepslate ores can now be doubled using an Ore Crusher 2021-06-26 00:05:43 +02:00
TheBusyBiscuit
86dd2bb41c
[CI skip] Updated changelog 2021-06-25 19:16:07 +02:00
TheBusyBiscuit
37ec181fd5
[CI skip] Prepare changelog for next development cycle 2021-06-20 15:28:35 +02:00
TheBusyBiscuit
5d34a25756
[CI skip] Update changelog 2021-06-19 10:45:01 +02:00
TheBusyBiscuit
96574bed6f Fixes #3116 2021-06-18 15:09:03 +02:00
TheBusyBiscuit
805c2eafcc Added a new feature to the debug fish 
SlimefunTag support
 2021-06-18 15:08:24 +02:00
TheBusyBiscuit
d49e38905f Updated changelog 2021-06-12 00:25:39 +02:00
TheBusyBiscuit
6fade87d8d
[CI skip] Updated changelog 2021-06-07 08:45:04 +02:00
TheBusyBiscuit
cc23211504 Added a startup warning for when CS-CoreLib is still installed 2021-06-06 11:49:44 +02:00
TheBusyBiscuit
bc6ad46d5a
[CI skip] Updated changelog 2021-06-03 23:21:04 +02:00
TheBusyBiscuit
5a1405014f [CI skip] Removed deprecated events and methods 2021-06-03 19:19:14 +02:00
TheBusyBiscuit
b7c6a431a5 [CI skip] Lock in RC-24 release date 2021-06-03 18:57:07 +02:00
TheBusyBiscuit
5a327be4ce
[CI skip] Updated changelog 2021-05-31 15:05:45 +02:00
TheBusyBiscuit
d39a5c1ba2 Fixed #3086 2021-05-31 10:26:42 +02:00
TheBusyBiscuit
cf362f7c7a Fixed #3087 2021-05-29 10:35:41 +02:00
TheBusyBiscuit
ab2049d1d2 Fixed #3088 2021-05-29 10:31:38 +02:00
TheBusyBiscuit
477cad5487 Fixed #3085 2021-05-29 00:40:32 +02:00
TheBusyBiscuit
76dda9a439 Fixed #3084 2021-05-29 00:21:37 +02:00
svr333
ba617a6ea6
Merge branch 'master' into api/machine-operations 2021-05-25 20:05:59 +02:00
TheBusyBiscuit
1be165ca44 Fixed recipe types showing missing string message 2021-05-25 11:04:59 +02:00
TheBusyBiscuit
4ed9dd7e59 Fixed #3075 2021-05-24 20:07:03 +02:00
TheBusyBiscuit
8a3d5cedc4
Merge pull request #3048 from Slimefun/fix/improve-research-message 
Add the item to the research message
 2021-05-24 16:40:18 +02:00
TheBusyBiscuit
9d3b8c7dbf
[CI skip] Updated changelog 2021-05-24 14:24:05 +02:00
TheBusyBiscuit
a5a8615af2 Updated changelog 2021-05-24 13:09:51 +02:00
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