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 |
|
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 |
|
TheBusyBiscuit
|
fa1cecef2f
|
[CI skip] Merge pull request #2436 from Slimefun/gitlocalize-13355
Updated bulgarian translations
|
2020-10-10 19:44:00 +02:00 |
|
TheBusyBiscuit
|
6434c79a0a
|
Translate messages_de.yml via GitLocalize
|
2020-10-10 17:33:22 +00:00 |
|
TheBusyBiscuit
|
1088aea40e
|
Translate researches_de.yml via GitLocalize
|
2020-10-10 17:33:20 +00:00 |
|
DNBGlol
|
01fc7cd536
|
Translate categories_bg.yml via GitLocalize
|
2020-10-10 17:28:03 +00:00 |
|
DNBGlol
|
c2ca5a1ea5
|
Translate resources_bg.yml via GitLocalize
|
2020-10-10 17:28:02 +00: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 |
|
TheBusyBiscuit
|
44e6449f9e
|
Merge pull request #2430 from Slimefun/gitlocalize-13351
Update messages_nl.yml
|
2020-10-10 15:27:19 +02:00 |
|
TheBusyBiscuit
|
c9ca11c62c
|
[CI skip] Merge pull request #2431 from Slimefun/gitlocalize-13352
Update recipes_nl.yml
|
2020-10-10 15:26:19 +02:00 |
|
TheBusyBiscuit
|
ea1d1756ae
|
[CI skip] Merge pull request #2432 from Slimefun/gitlocalize-13353
Update categories translation for Dutch
|
2020-10-10 15:25:32 +02:00 |
|
TheBusyBiscuit
|
08bb3291c1
|
[CI skip] Updated translators list
|
2020-10-10 15:25:03 +02:00 |
|
Senne Van Rompaey
|
47d39cdc3c
|
Translate categories_nl.yml via GitLocalize
|
2020-10-10 13:12:28 +00:00 |
|
milvantiou
|
025021f5b5
|
Translate categories_nl.yml via GitLocalize
|
2020-10-10 13:12:27 +00:00 |
|
Sven313D
|
af608e3c13
|
Translate recipes_nl.yml via GitLocalize
|
2020-10-10 12:42:09 +00:00 |
|
Senne Van Rompaey
|
e80b3b64d2
|
Translate messages_nl.yml via GitLocalize
|
2020-10-10 12:27:12 +00: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
|
4c47a9cb93
|
Merge pull request #2298 from Slimefun/tags
Implemented Tags
|
2020-10-10 13:38:48 +02:00 |
|
TheBusyBiscuit
|
cf6add1149
|
Some small improvements before the merge
|
2020-10-10 13:36:07 +02:00 |
|
TheBusyBiscuit
|
c03b54c2c3
|
[CI skip] Merge pull request #2417 from Slimefun/gitlocalize-13345
Updated Hungarian translations
|
2020-10-10 01:25:10 +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 |
|
LinoxGH
|
26d46c2dc9
|
Translate researches_tr.yml via GitLocalize
|
2020-10-09 14:48:14 +00:00 |
|
LinoxGH
|
7e3866a25b
|
Translate messages_tr.yml via GitLocalize
|
2020-10-09 14:48:12 +00:00 |
|
poma123
|
72f7441a18
|
Small fixes
|
2020-10-09 16:36:25 +02:00 |
|
poma123
|
b7b7fa8a34
|
Translate researches_hu.yml via GitLocalize
|
2020-10-09 14:30:47 +00:00 |
|
poma123
|
076f1b51a4
|
Translate resources_hu.yml via GitLocalize
|
2020-10-09 14:30:45 +00:00 |
|
poma123
|
5ac0792cb0
|
Translate recipes_hu.yml via GitLocalize
|
2020-10-09 14:30:43 +00:00 |
|
poma123
|
f3fafaff26
|
Translate categories_hu.yml via GitLocalize
|
2020-10-09 14:30:42 +00:00 |
|
poma123
|
bd0f15bc95
|
Translate messages_hu.yml via GitLocalize
|
2020-10-09 14:30:38 +00:00 |
|
bito-blosh
|
3e20911c48
|
Translate researches_ja.yml via GitLocalize
|
2020-10-09 12:13:19 +00:00 |
|
TheBusyBiscuit
|
c440fd0778
|
Translate messages_ja.yml via GitLocalize
|
2020-10-09 12:13:17 +00:00 |
|
TheBusyBiscuit
|
aab665ffea
|
Merge branch 'master' into tags
|
2020-10-09 11:46:47 +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 |
|
TheBusyBiscuit
|
2d00f3e704
|
Merge branch 'master' into tags
|
2020-10-08 16:16:11 +02:00 |
|
TheBusyBiscuit
|
26066f2e6c
|
Refactoring
|
2020-10-08 14:45:21 +02:00 |
|
TheBusyBiscuit
|
01d233af4d
|
Merge pull request #2402 from NCBPFluffyBear/gps-permission-fix
GPS Control Panel and GEO Scanner access checks
|
2020-10-08 14:37:16 +02:00 |
|
NCBPFluffyBear
|
90ccbb2261
|
Organized imports
|
2020-10-07 17:37:41 -05:00 |
|
NCBPFluffyBear
|
b577c1e4a3
|
Did changes
|
2020-10-07 13:45:49 -05:00 |
|
TheBusyBiscuit
|
126ccf3d01
|
Formatting
|
2020-10-07 18:43:55 +02:00 |
|
TheBusyBiscuit
|
7c3fc99b3a
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
tags
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemSetting.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosiveTool.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java
src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/implementations/tools/TestClimbingPick.java
|
2020-10-07 18:38:26 +02:00 |
|