1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Commit Graph

4662 Commits

Author SHA1 Message Date
TheBusyBiscuit
5fb1ca2b8e
[CI skip] Updated changelog 2020-09-13 23:38:29 +02:00
Daniel Walsh
07f5687b9f
Merge pull request #2323 from LinoxGH/patch-3 2020-09-13 22:33:13 +01:00
TheBusyBiscuit
69c134bd15
[CI skip] Merge pull request #2319 from Slimefun/renovate/org.junit.jupiter-junit-jupiter-5.x
Update dependency org.junit.jupiter:junit-jupiter to v5.7.0
2020-09-13 23:30:56 +02:00
LinoxGH
efe65bcd20
Fixed unit tests. 2020-09-14 00:11:34 +03:00
LinoxGH
19b95331d6
Added fire tag. 2020-09-13 23:55:16 +03:00
TheBusyBiscuit
5ea417b89f
Merge pull request #2321 from J3fftw1/fix/fixes-issue
fixed issue
2020-09-13 17:58:39 +02:00
Panda.com
5b217246b6 fixed issue 2020-09-13 17:48:48 +02:00
Renovate Bot
df327efdcc
Update dependency org.junit.jupiter:junit-jupiter to v5.7.0 2020-09-13 14:41:54 +00:00
TheBusyBiscuit
fe0395991e
[CI skip] Updated contributing guidelines 2020-09-13 12:41:32 +02:00
TheBusyBiscuit
817ec43153
[CI skip] Updated changelog 2020-09-13 12:38:13 +02:00
TheBusyBiscuit
04105b1b47
[CI skip] Added a line-break 2020-09-13 12:37:01 +02:00
TheBusyBiscuit
1e408665a7 [Ci skip] Removed deprecated method 2020-09-13 12:32:30 +02:00
TheBusyBiscuit
20c3835fc1 [CI skip] Updated README and CONTRIBUTING files 2020-09-13 12:26:12 +02:00
TheBusyBiscuit
7b10410a70 [Ci skip] A small change 2020-09-13 11:38:04 +02:00
TheBusyBiscuit
8838ab0963 [CI skip] Lock CS-CoreLib version 2020-09-13 11:37:07 +02:00
TheBusyBiscuit
4bfe587743 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2020-09-13 11:23:43 +02:00
TheBusyBiscuit
59ef524912 Updated pom.xml 2020-09-13 11:23:38 +02:00
TheBusyBiscuit
5d81808cba
[Ci skip] Added emojis to bug reporting template 2020-09-13 09:44:35 +02:00
TheBusyBiscuit
0c7597f3c9
[CI skip] Added emojis to Code of Conduct 2020-09-13 09:40:54 +02:00
TheBusyBiscuit
d0434de4d5
[CI skip] Added emojis to CONTRIBUTING.md 2020-09-13 09:38:41 +02:00
TheBusyBiscuit
363462095d
[CI skip] Merge pull request #2318 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.5.2
2020-09-13 09:25:46 +02:00
Renovate Bot
ebdb295364
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.5.2 2020-09-12 22:23:28 +00:00
TheBusyBiscuit
611465ab35
[CI skip] Updated action 2020-09-12 16:24:15 +02:00
TheBusyBiscuit
a9dd96c07b
[CI skip] Updated hacktoberfest template 2020-09-12 16:22:42 +02:00
TheBusyBiscuit
6e2af2efe3
[CI skip] Merge pull request #2313 from Slimefun/hacktoberfest-template
Proposing a Hacktoberfest Issue template
2020-09-12 16:15:57 +02:00
TheBusyBiscuit
efea4b2553
#TeamTrees 2020-09-12 16:09:36 +02:00
TheBusyBiscuit
1d7403f523
Update hacktoberfest-issue.md 2020-09-12 15:59:52 +02:00
TheBusyBiscuit
e22db45fbb
Update hacktoberfest-issue.md 2020-09-12 15:54:46 +02:00
TheBusyBiscuit
238be74da3
Update hacktoberfest-issue.md 2020-09-12 15:51:15 +02:00
TheBusyBiscuit
6c442125eb
Update hacktoberfest-issue.md 2020-09-12 15:49:23 +02:00
TheBusyBiscuit
f563580980 Added Hacktoberfest Issue template 2020-09-12 15:44:53 +02:00
TheBusyBiscuit
e56f8b446c
Merge pull request #2312 from TheSilentPro/master
Fixed colors & functionality of cheat sheet
2020-09-12 15:40:06 +02:00
TheSilentPro
fd935fb46f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunGuideListener.java
2020-09-12 15:20:49 +02:00
Silent
03f7e64107 Fixed colors & functionality of cheat sheet 2020-09-12 15:19:07 +02:00
Silent
3fcc7fafac Fixed colors & functionality of cheat sheet 2020-09-12 14:50:22 +02:00
TheBusyBiscuit
8f95cb4f84
[CI skip] Merge pull request #2311 from poma123/fix/typos
Fixed some typos
2020-09-11 20:48:20 +02:00
poma123
acd26b68dd We can use useable anyway 2020-09-11 20:29:23 +02:00
poma123
be5f793695 Fixed a bunch of typos 2020-09-11 20:02:17 +02:00
TheBusyBiscuit
e2c021d270
Merge pull request #2310 from LinoxGH/patch-3
Changed the used sound categories.
2020-09-11 19:52:48 +02:00
LinoxGH
0177ee13dd
Changed the used SoundCategory. 2020-09-11 20:29:28 +03:00
LinoxGH
ca20594032
Added changed the used SoundCategory. 2020-09-11 20:27:38 +03:00
TheBusyBiscuit
1f636271d6
[CI skip] Rename workflow 2020-09-11 17:54:12 +02:00
TheBusyBiscuit
2529336889
[CI skip] Auto-Approve should now trigger twice 2020-09-11 17:50:38 +02:00
TheBusyBiscuit
05fd47a170
Merge pull request #2309 from NCBPFluffyBear/charge-command
Charge command
2020-09-11 10:31:45 +02:00
TheBusyBiscuit
5989fde476
[CI skip] Updated changelog 2020-09-11 10:21:07 +02:00
NCBPFluffyBear
37c0ce4ce0 Organized imports 2020-09-10 23:52:19 -05:00
NCBPFluffyBear
128bc65417 Did requested changes 2020-09-10 16:36:52 -05:00
NCBPFluffyBear
57f52f62c6 Did requested changes 2020-09-10 16:27:50 -05:00
NCBPFluffyBear
6b95ed0293 Added Charge Command 2020-09-10 16:02:03 -05:00
FluffyBear
e1b9238cf1
Merge pull request #2 from Slimefun/master
Update
2020-09-10 15:45:37 -05:00