mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity
1,963 Commits 1 Branch 0 Tags 64 MiB
aa3007ef0a
Commit Graph

1963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Poma123
918d9c3506
Update AutoDisenchanter.java 2019-11-16 16:36:45 +01:00
Poma123
212b7cffd3
Update AutoDisenchantEvent.java 2019-11-16 16:35:22 +01:00
Poma123
72a7f4598f
Update and rename DisenchanterEvent.java to AutoDisenchantEvent.java 2019-11-16 16:34:14 +01:00
Poma123
201159f3bf
Update AutoDisenchanter.java 2019-11-16 16:29:59 +01:00
Poma123
537fc57f48
Update AutoDisenchanter.java 2019-11-16 16:27:15 +01:00
Poma123
d18adecb9a
Update DisenchanterEvent.java 2019-11-16 16:26:28 +01:00
Poma123
fa57e61447
Update AutoDisenchanter.java 2019-11-16 15:50:52 +01:00
Poma123
6f3bf2db13
Update DisenchanterEvent.java 2019-11-16 15:49:06 +01:00
Poma123
c6428c0e4b
Update AutoDisenchanter.java 2019-11-16 14:09:09 +01:00
Poma123
f0c0919bce
Add DisenchanterEvent 2019-11-16 14:08:38 +01:00
TheBusyBiscuit
fcf9b547c1
Merge pull request #1230 from SoSeDiK/transmitters 
Transmitters
 2019-11-16 14:08:22 +01:00
TheBusyBiscuit
09ab124e36 Added Output Chest support to the Table Saw 2019-11-10 20:18:06 +01:00
SoSeDiK
78c81bafdb
Merge branch 'master' into transmitters 2019-11-10 21:04:50 +02:00
TheBusyBiscuit
7890edd295 Added Output Chest Support to the Automated Panning Machine 2019-11-10 19:44:53 +01:00
TheBusyBiscuit
a10fe1e514 Fixed custom model data 2019-11-10 18:54:53 +01:00
TheBusyBiscuit
40616ee47e
Merge pull request #1239 from TheBusyBiscuit/custom-textures 
Added support for custom item models
 2019-11-10 18:52:36 +01:00
TheBusyBiscuit
97d8ce1546 Moved CoreProtect integration to CS-CoreLib2 2019-11-10 18:52:18 +01:00
TheBusyBiscuit
3e30ce8d14 Reduced technical debt 2019-11-10 18:43:37 +01:00
TheBusyBiscuit
2459469c9d Added support for custom item models 2019-11-10 17:46:18 +01:00
TheBusyBiscuit
2c7e155aa1 Added different kinds of Jerky to the Auto-Drier 2019-11-10 13:51:56 +01:00
TheBusyBiscuit
25f8566196
Merge pull request #1222 from AlexLander123/fixes 
Changed method of accessing reactor from access port
 2019-11-10 13:01:19 +01:00
TheBusyBiscuit
fc67fac34c [CI skip] Changed default version string 2019-11-10 13:01:07 +01:00
TheBusyBiscuit
c8f9b5a07b
Merge pull request #1233 from AlexLander123/fix-ancient-altar 
Fixed ancient alter logic
 2019-11-06 00:01:28 +01:00
AlexLander123
c13ec9903c Ancient altar no longer able to craft items that are not unlocked 2019-11-06 02:17:52 +08:00
AlexLander123
9442fa65ca Fixed ancient alter logic 2019-11-06 00:56:03 +08:00
AlexLander123
e4efed0640 Made requested changes 
- Added null check
- Changed "a access port" to "the access port"
- Removed extra menu.open(p)
 2019-11-06 00:08:25 +08:00
SoSeDiK
2fb92c5083 Update GPSNetwork.java 2019-11-04 16:36:10 +02:00
SoSeDiK
0302810c9c Replaced double with int 2019-11-04 16:33:40 +02:00
SoSeDiK
09c02b7848 Fixed transmitter locations 2019-11-04 16:28:12 +02:00
TheBusyBiscuit
8895beb83a [CI skip] Minor refactoring 2019-11-03 23:43:11 +01:00
TheBusyBiscuit
57da6db9be Reduced technical debt and improved talisman performance 2019-11-03 21:32:44 +01:00
TheBusyBiscuit
a1e47d5ce0 Many bug fixes, many guide improvements 2019-11-03 20:36:46 +01:00
TheBusyBiscuit
27019c9ceb Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-11-03 20:28:35 +01:00
TheBusyBiscuit
6a1b6ffd92 Added support for ALL Vanilla Recipes (+ Faster Guide Responses) 2019-11-03 20:28:25 +01:00
TheBusyBiscuit
f70966faec
[CI skip] Merge pull request #1228 from WalshyDev/fix/apply-repair-cost 
Bring across repair cost in the disenchanter
 2019-11-03 20:15:11 +01:00
Daniel Walsh
2febbe4d1c order 2019-11-03 19:05:32 +00:00
Daniel Walsh
d88291e215 Bring across repair cost in the disenchanter 2019-11-03 19:03:55 +00:00
TheBusyBiscuit
d86cb5e5b6 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-11-03 19:23:39 +01:00
TheBusyBiscuit
fc6bd05b4f
[CI skip] Merge pull request #1223 from J3fftw1/good/fix/yes/yes 
Fixes
 2019-11-03 19:23:19 +01:00
TheBusyBiscuit
beebbda2dd Fixes #1224 2019-11-03 19:20:22 +01:00
TheBusyBiscuit
5c860cbfa4 Fixes #1226 2019-11-03 19:20:12 +01:00
J3fftw1
cade8df053 Fixes #1219 2019-10-31 16:24:27 +01:00
AlexLander123
6dd56e23f2 Changed method of accessing reactor from access port 
The change is made to stop inventory.no-access message when opening access port due to canOpen(Block, Player) returning false
 2019-10-31 22:01:53 +08:00
TheBusyBiscuit
05858309c5 [CI skip] Reduced technical debt 2019-10-29 09:13:32 +01:00
TheBusyBiscuit
eee7642fc8
[CI skip] Merge pull request #1213 from TheBusyBiscuit/renovate/com.github.thebusybiscuit-cs-corelib2-0.x 
Update dependency com.github.thebusybiscuit:CS-CoreLib2 to v0.7
 2019-10-29 08:27:26 +01:00
Renovate Bot
26cccb0d1c
Update dependency com.github.thebusybiscuit:CS-CoreLib2 to v0.7 2019-10-28 23:44:59 +00:00
TheBusyBiscuit
7ba0eba4e9 Fixes #1211 2019-10-28 14:53:54 +01:00
TheBusyBiscuit
461555d76f
Merge pull request #1210 from AlexLander123/fixes 
Allow reactors to take in fuel from access port
 2019-10-27 21:16:43 +01:00
AlexLander123
8601986c09 Allow reactors to take in fuel from access port 
- Also allow reactors to take in fuel in bulk
 2019-10-28 04:02:06 +08:00
TheBusyBiscuit
9f3c3a413b Some optimizations, also changed /sf timings to use floating point times 2019-10-27 20:07:12 +01:00