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
5,073 Commits 1 Branch 0 Tags 64 MiB
766a245a16
Commit Graph

5073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheBusyBiscuit
fbfd37c4a3
Merge pull request #2341 from J3fftw1/update/didnt-i-already-do-this 
Added materials to CoalGenerator
 2020-09-22 15:34:16 +02:00
TheBusyBiscuit
8365d1e6d9
Merge branch 'master' into tags 2020-09-22 15:33:56 +02:00
TheBusyBiscuit
e0a76fa0e8
[CI skip] Updated changelog 2020-09-22 15:32:06 +02:00
TheBusyBiscuit
f60fbc7fcd
[CI skip] Updated Discord Banner in README 2020-09-22 10:15:02 +02:00
TheBusyBiscuit
d35ee992ae [CI skip] Added another Unit Test 2020-09-21 23:54:21 +02:00
Panda.com
1c0abdd3fe Did i really get out of bed for this 2020-09-21 23:22:13 +02:00
Panda.com
c8d22fa381 did requested changes 2020-09-21 22:32:04 +02:00
Panda.com
f63d246b82 changed doors to wooden_doors 2020-09-21 22:26:54 +02:00
Panda.com
59f422c757 note to self listen to your notes 2020-09-21 22:16:32 +02:00
Panda.com
b7def0f58d Added materials to CoalGenerator 2020-09-21 22:14:22 +02:00
TheBusyBiscuit
4412b40709
Merge branch 'master' into tags 2020-09-21 15:59:08 +02:00
TheBusyBiscuit
f3b5581a11
Merge pull request #2336 from Seggan/master 
Added Energized Capacitor (From Discord suggestion)
 2020-09-21 15:47:23 +02:00
TheBusyBiscuit
a36dfc1151
[CI skip] Updated changelog 2020-09-21 15:47:06 +02:00
TheBusyBiscuit
2f37c2b8b7
Merge branch 'master' into tags 2020-09-21 13:24:44 +02:00
TheBusyBiscuit
5cd1d99b70 Fixes #2322 2020-09-21 13:23:14 +02:00
TheBusyBiscuit
9dfd43fda6 Fixed Climbing Pick having no animation in creative mode 2020-09-21 13:14:56 +02:00
TheBusyBiscuit
cdc495e62b Fixes #2325 2020-09-21 13:09:45 +02:00
TheBusyBiscuit
0227e0cc30 [CI skip] Reduced technical debt 2020-09-21 12:51:13 +02:00
Seggan
cbafa4c59c Moved some code and changed energized capacitor recipe 2020-09-20 20:15:32 -04:00
Seggan
5857b85199 Added research text 2020-09-20 12:52:16 -04:00
Seggan
55a384ab87 Made energized capacitor tier 3 (Did I miss any code?) 2020-09-20 12:16:56 -04:00
Seggan
641def8481 Added Energized Capacitor (From Discord suggestion) 2020-09-19 21:43:52 -04:00
FluffyBear
a843e99dbf
Merge pull request #3 from Slimefun/master 
Update
 2020-09-19 16:27:08 -05:00
poma123
8592051f87 Requested changes 2020-09-19 18:58:38 +02:00
TheBusyBiscuit
749bb972a3 [CI skip] Added a few more annotations 2020-09-19 11:51:02 +02:00
TheBusyBiscuit
23bf314905 Added fluid-sensitive tag 2020-09-19 11:39:35 +02:00
TheBusyBiscuit
32462b0554 Merge branch 'tags' of https://github.com/Slimefun/Slimefun4.git into 
tags

Conflicts:
	CHANGELOG.md
 2020-09-19 11:36:34 +02:00
TheBusyBiscuit
9547d51db2 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
tags

Conflicts:
	CHANGELOG.md
	src/test/java/io/github/thebusybiscuit/slimefun4/testing/TestUtilities.java
 2020-09-19 11:35:41 +02:00
poma123
24a97c59d8 Refactoring 2020-09-19 10:37:33 +02:00
poma123
b98cdcf7d8 Added AsyncReactorProcessCompleteEvent 2020-09-19 10:37:06 +02:00
poma123
fa1aad7bf8 Added AsyncGeneratorProcessCompleteEvent 2020-09-19 10:36:27 +02:00
TheBusyBiscuit
8fee7ad07d
[CI skip] Merge pull request #2332 from Slimefun/renovate/org.mockito-mockito-core-3.x 
Update dependency org.mockito:mockito-core to v3.5.11
 2020-09-18 18:49:06 +02:00
TheBusyBiscuit
917bcce636 Fixed an issue with ChestTerminal 2020-09-18 10:48:36 +02:00
Renovate Bot
d79db00bf7
Update dependency org.mockito:mockito-core to v3.5.11 2020-09-18 00:28:24 +00:00
TheBusyBiscuit
0e070a01c7
[CI skip] Updated contributing guidelines 2020-09-17 18:29:52 +02:00
TheBusyBiscuit
0cc934f247
[CI skip] Merge pull request #2329 from Slimefun/renovate/org.jacoco-jacoco-maven-plugin-0.x 
Update dependency org.jacoco:jacoco-maven-plugin to v0.8.6
 2020-09-16 09:10:22 +02:00
Renovate Bot
824d524d9a
Update dependency org.jacoco:jacoco-maven-plugin to v0.8.6 2020-09-15 21:47:54 +00:00
TheBusyBiscuit
3a0de6f800
[CI skip] Updated issues template 2020-09-14 13:58:44 +02:00
TheBusyBiscuit
8652f45b0a
Merge branch 'master' into tags 2020-09-13 23:39:10 +02:00
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