Senne Van Rompaey
|
4d474de290
|
Merge branch 'master' into MoreTalismans
|
2020-10-12 00:57:11 +02:00 |
|
svr333
|
b0b5c5a47f
|
Simplify to talisman.isItem()
|
2020-10-12 00:20:39 +02:00 |
|
svr333
|
125239f173
|
Refactor and rename methods
|
2020-10-12 00:19:19 +02:00 |
|
TheBusyBiscuit
|
f1dea4cab9
|
Merge pull request #2451 from CURVX/master
Fix #2433
|
2020-10-11 18:09:23 +02:00 |
|
CURVX
|
a9e64dbcfc
|
Resolves #2433
|
2020-10-11 19:58:17 +05:30 |
|
CURVX
|
064453346d
|
Resolves #2433
|
2020-10-11 19:49:34 +05:30 |
|
TheBusyBiscuit
|
c099f0bed4
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
|
2020-10-11 15:41:47 +02:00 |
|
TheBusyBiscuit
|
df4a87d9fa
|
[Ci skip] A little bit of refactoring
|
2020-10-11 15:41:42 +02:00 |
|
TheBusyBiscuit
|
15884c65aa
|
Merge pull request #2435 from TheSilentPro/master fixes #2420 fixes #2422
Stop unwanted actions from StrangeNetherGoo and Heavy Cream
|
2020-10-11 13:46:40 +02:00 |
|
TheBusyBiscuit
|
b4b18f548f
|
[CI skip] Reduced technical debt
|
2020-10-11 12:48:51 +02:00 |
|
Silent
|
7177946aae
|
Changes pt2
|
2020-10-11 12:44:15 +02:00 |
|
TheBusyBiscuit
|
b80bc87ddc
|
Merge pull request #2440 from LinoxGH/ExplosivePickFix Fixed #2439
|
2020-10-11 12:27:27 +02:00 |
|
Silent
|
2902f74d10
|
Changes
|
2020-10-11 12:14:58 +02:00 |
|
LinoxGH
|
4980b078a1
|
Update BlockListener.java
|
2020-10-11 08:50:04 +03:00 |
|
LinoxGH
|
7af1e8144d
|
Update ExplosiveTool.java
|
2020-10-11 08:48:27 +03:00 |
|
TheBusyBiscuit
|
bc6ac0a4d1
|
[CI skip] Added Tape Measure Unit Tests
|
2020-10-11 01:27:38 +02:00 |
|
LinoxGH
|
957bcd9a3a
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
|
2020-10-11 02:01:54 +03:00 |
|
LinoxGH
|
6082abb9b6
|
Merge branch 'master' into ExplosivePickFix
|
2020-10-11 00:23:59 +03:00 |
|
LinoxGH
|
bf3e6754cc
|
Changed event priorities.
|
2020-10-11 00:19:15 +03:00 |
|
LinoxGH
|
05d7ab5643
|
Update ExplosiveTool.java
|
2020-10-11 00:12:42 +03:00 |
|
Silent
|
dfe33b3534
|
Didn't know this existed
|
2020-10-10 22:05:50 +02:00 |
|
TheBusyBiscuit
|
bf25fc0b9d
|
[CI skip] Added Unit Tests for new Item Settings
|
2020-10-10 21:55:54 +02:00 |
|
TheBusyBiscuit
|
594d322df2
|
[CI skip] Added EnumSetting
|
2020-10-10 21:20:25 +02:00 |
|
TheBusyBiscuit
|
a44f2fa626
|
[CI skip] Some cleanup
|
2020-10-10 20:46:17 +02:00 |
|
Silent
|
f9928e5e10
|
Add requested changes
|
2020-10-10 20:20:08 +02:00 |
|
TheBusyBiscuit
|
2da7efd380
|
[CI skip] Updated a javadocs tag
|
2020-10-10 19:18:15 +02:00 |
|
TheBusyBiscuit
|
b60c2382a5
|
[CI skip] Quickly added DoubleRangeSetting copy
|
2020-10-10 18:52:22 +02:00 |
|
Silent
|
cf0f7c37e0
|
Merge remote-tracking branch 'upstream/master'
|
2020-10-10 18:50:49 +02:00 |
|
Silent
|
0580a873ec
|
Stop unwanted actions with StrangeNetherGoo and HeavyCream
|
2020-10-10 18:50:41 +02:00 |
|
TheBusyBiscuit
|
08bb3291c1
|
[CI skip] Updated translators list
|
2020-10-10 15:25:03 +02:00 |
|
TheBusyBiscuit
|
fd123b0bc2
|
[CI skip] Added another validation to head textures, looks at Linox
|
2020-10-10 14:22:14 +02:00 |
|
TheBusyBiscuit
|
f895adde61
|
[CI skip] Reduced technical debt
|
2020-10-10 14:17:05 +02:00 |
|
TheBusyBiscuit
|
cf6add1149
|
Some small improvements before the merge
|
2020-10-10 13:36:07 +02:00 |
|
TheBusyBiscuit
|
72d3d24394
|
Two annotations!
|
2020-10-09 17:44:15 +02:00 |
|
TheBusyBiscuit
|
83e8010e29
|
Lots of refactoring
|
2020-10-09 17:39:21 +02:00 |
|
svr333
|
64684d86c3
|
Reduce to local scoop
|
2020-10-09 16:49:06 +02:00 |
|
TheBusyBiscuit
|
aab665ffea
|
Merge branch 'master' into tags
|
2020-10-09 11:46:47 +02:00 |
|
svr333
|
b042fbd3a4
|
Add check for ProtectionManagers
|
2020-10-08 22:34:18 +02:00 |
|
svr333
|
1cfc8aec90
|
Refactor (no build errors)
|
2020-10-08 22:15:30 +02:00 |
|
LinoxGH
|
b2833dc5c0
|
Update MagicalZombiePills.java
|
2020-10-08 21:42:57 +03:00 |
|
TheBusyBiscuit
|
8c80ad4040
|
Cleanup
|
2020-10-08 19:05:23 +02:00 |
|
TheBusyBiscuit
|
d891d182b5
|
Intentionally messed up imports
|
2020-10-08 18:53:19 +02:00 |
|
svr333
|
dc21ec5752
|
Merge branch 'MoreTalismans' of https://github.com/svr333/Slimefun4 into MoreTalismans
|
2020-10-08 18:23:15 +02:00 |
|
svr333
|
172dfc0610
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into MoreTalismans
|
2020-10-08 18:22:23 +02:00 |
|
svr333
|
7c030c736f
|
Refactor (still build errors)
|
2020-10-08 18:21:00 +02:00 |
|
TheBusyBiscuit
|
ddd8ccec6b
|
Imports go brrrrrr
|
2020-10-08 18:12:34 +02:00 |
|
TheBusyBiscuit
|
2d00f3e704
|
Merge branch 'master' into tags
|
2020-10-08 16:16:11 +02:00 |
|
svr333
|
82716dd808
|
Fix resurrected_talisman lore
|
2020-10-08 15:30:25 +02:00 |
|
svr333
|
73cbbc3b54
|
Improve recipes of new Talismans
|
2020-10-08 15:29:46 +02:00 |
|
TheBusyBiscuit
|
26066f2e6c
|
Refactoring
|
2020-10-08 14:45:21 +02:00 |
|