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

4837 Commits

Author SHA1 Message Date
LinoxGH
3767839310 Translate recipes_tr.yml via GitLocalize 2020-10-09 14:48:15 +00: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
TheBusyBiscuit
3fc3770fb8
[CI skip] Merge pull request #2415 from Slimefun/gitlocalize-13343
Update Japanese translation files.
2020-10-09 14:20:28 +02:00
TheBusyBiscuit
a8aef2a175
[CI skip] Merge pull request #2416 from Slimefun/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.11.01
2020-10-09 14:18:33 +02:00
Renovate Bot
06272780bf
Update dependency com.konghq:unirest-java to v3.11.01 2020-10-09 12:16:10 +00:00
bito-blosh
3e20911c48 Translate researches_ja.yml via GitLocalize 2020-10-09 12:13:19 +00:00
bito-blosh
f95a4cfd1c Translate messages_ja.yml via GitLocalize 2020-10-09 12:13:18 +00:00
TheBusyBiscuit
c440fd0778 Translate messages_ja.yml via GitLocalize 2020-10-09 12:13:17 +00:00
TheBusyBiscuit
de5db265d5
Merge pull request #2413 from LinoxGH/ZombiePillFix fixes #2412
Zombie pill fix
2020-10-08 21:20:50 +02:00
TheBusyBiscuit
a82eb7405a
[CI skip] Updated changelog 2020-10-08 21:20:38 +02:00
LinoxGH
b2833dc5c0
Update MagicalZombiePills.java 2020-10-08 21:42:57 +03:00
LinoxGH
0313973653
Merge pull request #8 from Slimefun/master
Update
2020-10-08 21:40:47 +03:00
TheBusyBiscuit
b05977c39b
[CI skip] Removed imports workflow 2020-10-08 19:04:23 +02:00
TheBusyBiscuit
6f4802f7b6
[CI skip] Fixed imports workflow 2020-10-08 18:33:01 +02:00
TheBusyBiscuit
20405a775b
[CI skip] Added Imports cleanup action 2020-10-08 18:11:16 +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
TheBusyBiscuit
359cba3c13
[CI skip] Updated changelog 2020-10-08 14:36:58 +02:00
TheBusyBiscuit
793ec142d2
[CI skip] Merge pull request #2407 from Slimefun/code-style
Added some code-style guidelines to CONTRIBUTING
2020-10-08 14:35:47 +02:00
TheBusyBiscuit
f3e1502203
Added a disclaimer 2020-10-08 11:39:51 +02:00
TheBusyBiscuit
033bd3b469
Update CONTRIBUTING.md 2020-10-08 11:18:22 +02:00
TheBusyBiscuit
fb8ff55504
Added missing bracket 2020-10-08 10:43:14 +02:00
TheBusyBiscuit
f2db686aba
Added info about guard blocks 2020-10-08 00:47:19 +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
4936c25e49
Horizontal whitespaces 2020-10-07 18:53:13 +02:00
TheBusyBiscuit
95084eff70
Added empty lines 2020-10-07 18:32:36 +02:00
TheBusyBiscuit
fc26f959b6 [CI skip] Small formatting correction 2020-10-07 18:30:21 +02:00
TheBusyBiscuit
ddf9016b05
StringBuilder 2020-10-07 18:28:04 +02:00
TheBusyBiscuit
e4ddc7c452 [CI skip] Enforce OTBS. 2020-10-07 18:27:01 +02:00
TheBusyBiscuit
fa2c1d9957
Updated code style guidelines 2020-10-07 18:25:33 +02:00
TheBusyBiscuit
ed8f0e243b Fixes #2405 2020-10-07 17:48:53 +02:00
TheBusyBiscuit
9436f2ec47
Update CONTRIBUTING.md 2020-10-07 17:32:14 +02:00
TheBusyBiscuit
816c0a4e49
Updated headings 2020-10-07 17:23:44 +02:00
TheBusyBiscuit
bbb2a78a4c
Added some code-style guidelines to CONTRIBUTING 2020-10-07 17:16:33 +02:00
TheBusyBiscuit
78515a3c61
Merge pull request #2396 from svr333/AddSticksRecipeToTableSaw
Add sticks recipe to table saw
2020-10-07 16:31:58 +02:00
TheBusyBiscuit
354cb201c5
[CI skip] Updated changelog 2020-10-07 16:31:33 +02:00
TheBusyBiscuit
20a9c642fe Some code cleanup 2020-10-07 16:24:14 +02:00
TheBusyBiscuit
80c4242dd7
Merge pull request #2384 from Seggan/master
Added Elytra Cap
2020-10-07 16:01:45 +02:00
TheBusyBiscuit
7b179239e4
[CI skip] Updated changelog 2020-10-07 16:01:19 +02:00
TheBusyBiscuit
942cb8e1e1
Merge pull request #2404 from Sfiguz7/master
Fixes #2403
2020-10-07 14:30:10 +02:00
TheBusyBiscuit
c33f73d2fe
[CI skip] Updated changelog 2020-10-07 14:30:01 +02:00
Sfiguz7
91a7d9eacd Why u do dis IntelliJ >:( 2020-10-07 13:37:32 +02:00
Sfiguz7
46dca73e04 Forgot to clean crucible changes off 2020-10-07 13:36:11 +02:00
Sfiguz7
f8be447821 Fixes #2403 2020-10-07 13:32:10 +02:00
Sfiguz7
51d0ac0417 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-10-07 13:06:45 +02:00
svr333
85091516db Add generic fail message 2020-10-07 12:12:02 +02:00
NCBPFluffyBear
37f0715156 Added permission checks for the GEO Scanner and GPS Control Panel 2020-10-06 19:46:22 -05:00
Seggan
1ccd4c14ac More changes... 2020-10-06 15:41:14 -04:00