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
4,760 Commits 1 Branch 0 Tags 64 MiB
078e749679
Commit Graph

4760 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheBusyBiscuit
dc7d892ff9
Merge pull request #2256 from LinoxGH/FluidPump 
Fixed Fluid Pump dupe.
 2020-08-28 19:55:03 +02:00
LinoxGH
f371a5fda6
Fixed a stupid issue and added some docs. 2020-08-27 20:53:13 +03:00
LinoxGH
8c1cccc390
Forgot about imports. 2020-08-27 20:33:01 +03:00
LinoxGH
fd665843a0
Did requested changes. 2020-08-27 20:20:13 +03:00
LinoxGH
53abf76a35
Fixed Fluid Pump dupe. 2020-08-27 20:08:02 +03:00
TheBusyBiscuit
f97935b5c7
Deleted unused class 2020-08-27 14:29:02 +02:00
TheBusyBiscuit
fcbae02a4b Fixs #2208 2020-08-27 14:16:09 +02:00
TheBusyBiscuit
4232caf17a [CI skip] Reduced technical debt 2020-08-27 13:16:38 +02:00
TheBusyBiscuit
b9b3d7f504 [CI skip] Removed deprecated class 2020-08-27 13:00:36 +02:00
TheBusyBiscuit
4dab0c5b47 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into refactoring/block-energy 2020-08-26 17:51:43 +02:00
TheBusyBiscuit
dd67ccc28a Merge branch 'refactoring/block-energy' of https://github.com/TheBusyBiscuit/Slimefun4 into refactoring/block-energy 2020-08-26 17:51:22 +02:00
TheBusyBiscuit
3bc943bdb2 Little bit of refactoring 2020-08-26 14:33:40 +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
cced66725a
[CI skip] Merge pull request #2255 from TheBusyBiscuit/renovate/org.mockito-mockito-core-3.x 
Update dependency org.mockito:mockito-core to v3.5.7
 2020-08-26 12:20:18 +02:00
Renovate Bot
11d751eecd
Update dependency org.mockito:mockito-core to v3.5.7 2020-08-25 23:31:28 +00:00
TheBusyBiscuit
5942e3b9e8
[CI skip] Updated yaml linter rules 2020-08-25 01:29:57 +02:00
TheBusyBiscuit
3e22e702d1
[CI skip] Merge pull request #2252 from TheBusyBiscuit/renovate/org.mockito-mockito-core-3.x 
Update dependency org.mockito:mockito-core to v3.5.6
 2020-08-25 01:27:28 +02:00
TheBusyBiscuit
2c319d866f Fixed Unit Test 2020-08-25 01:17:11 +02:00
Renovate Bot
8d774dec3f
Update dependency org.mockito:mockito-core to v3.5.6 2020-08-24 23:00:40 +00:00
TheBusyBiscuit
6ca009e48d
Updated MockBukkit 2020-08-24 23:23:34 +02:00
TheBusyBiscuit
dba52edc47 Merge branch 'master' into experimental 2020-08-24 21:12:38 +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
ecde46616a Climbing Pick no longer causes fall damage 2020-08-24 20:59:01 +02:00
TheBusyBiscuit
89a5db2593 Fixed Unit Tests for Climbing Pick 2020-08-24 20:45:45 +02:00
TheBusyBiscuit
9e92f64222 Added damageable setting 2020-08-24 20:35:35 +02:00
TheBusyBiscuit
8c2038634f Fixed dual wielding climbing picks and added messages 2020-08-24 20:31:54 +02:00
TheBusyBiscuit
b81959e7a0 Added dual-wielding to the Climbing Pick 2020-08-24 20:19:24 +02:00
TheBusyBiscuit
a45815ead9
Merge pull request #2056 from LinoxGH/IcePick 
Added Climbing Pick
 2020-08-24 18:14:34 +02:00
TheBusyBiscuit
076ae6532b Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-24 18:12:31 +02:00
TheBusyBiscuit
d7ca5ab88d
Merge pull request #2248 from poma123/patch-1 fixes #2243 
Fixed android script editor menu hotkey glitch
 2020-08-24 18:09:27 +02:00
TheBusyBiscuit
951889c629
[CI skip] Updated change log 2020-08-24 18:09:05 +02:00
poma123
7b7c6350c6 Fixed android script editor menu hotkey glitch 2020-08-24 15:30:51 +02:00
TheBusyBiscuit
605862b400 Improved consistency and reduced redundancy 2020-08-24 14:26:11 +02:00
TheBusyBiscuit
79b3baefed Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-24 14:18:05 +02:00
TheBusyBiscuit
15626c95f6
[CI skip] Updated change log 2020-08-24 13:27:35 +02:00
TheBusyBiscuit
a2b2478394
Update EnergyNet.java 2020-08-24 02:18:32 +02:00
TheBusyBiscuit
d998f3ec8c
Merge branch 'master' into refactoring/block-energy 2020-08-24 02:11:59 +02:00
TheBusyBiscuit
155092a321 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 
Conflicts:
	pom.xml
 2020-08-23 17:57:13 +02:00
TheBusyBiscuit
f51a19777f [CI skip] Added more Unit tests 2020-08-23 17:56:38 +02:00
TheBusyBiscuit
bab5f8a9b5
Merge pull request #2246 from Sfiguz7/master 
Sf give drops excess items
 2020-08-23 17:54:14 +02:00
Sfiguz7
89fdf45d28 I said, fixed extra indentation 2020-08-23 17:50:31 +02:00
Sfiguz7
44451d6244 Fixed extra indentation 2020-08-23 17:49:44 +02:00
Sfiguz7
813200b29c Made requested changes 2020-08-23 15:36:10 +02:00
TheBusyBiscuit
49573ad55b
[CI skip] Merge pull request #2244 from TheBusyBiscuit/renovate/com.konghq-unirest-java-3.x 
Update dependency com.konghq:unirest-java to v3.10.00
 2020-08-23 14:12:11 +02:00
TheBusyBiscuit
b12a2537d4
[CI skip] Merge pull request #2242 from TheBusyBiscuit/renovate/org.mockito-mockito-core-3.x 
Update dependency org.mockito:mockito-core to v3.5.5
 2020-08-23 14:11:31 +02:00
Sfiguz7
e06d17f8e5 Restored original plugin.yml as pulling hadn't 2020-08-23 13:58:29 +02:00
Sfiguz7
bdd2adc21e Cleared unused imports I forgot to delete 2020-08-23 13:56:39 +02:00
Sfiguz7
eb66f3e183 Added option to drop excess items on /sf give 2020-08-23 13:54:51 +02:00
Renovate Bot
69a3c227dc
Update dependency com.konghq:unirest-java to v3.10.00 2020-08-22 22:08:54 +00:00