poma123
|
076f1b51a4
|
Translate resources_hu.yml via GitLocalize
|
2020-10-09 14:30:45 +00:00 |
|
András Marczinkó
|
e10c302488
|
Translate recipes_hu.yml via GitLocalize
|
2020-10-09 14:30:44 +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 |
|
TheBusyBiscuit
|
00a7bb4474
|
Translate messages_hu.yml via GitLocalize
|
2020-10-09 14:30:40 +00:00 |
|
András Marczinkó
|
ad36fb857f
|
Translate messages_hu.yml via GitLocalize
|
2020-10-09 14:30:39 +00:00 |
|
poma123
|
bd0f15bc95
|
Translate messages_hu.yml via GitLocalize
|
2020-10-09 14:30:38 +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
|
aab665ffea
|
Merge branch 'master' into tags
|
2020-10-09 11:46:47 +02:00 |
|
TheBusyBiscuit
|
3bb974ce96
|
Delete imports-fix.yml
|
2020-10-08 23:25:07 +02:00 |
|
svr333
|
b042fbd3a4
|
Add check for ProtectionManagers
|
2020-10-08 22:34:18 +02:00 |
|
svr333
|
9dcf895258
|
Merge branch 'MoreTalismans' of https://github.com/svr333/Slimefun4 into MoreTalismans
|
2020-10-08 22:15:53 +02:00 |
|
svr333
|
1cfc8aec90
|
Refactor (no build errors)
|
2020-10-08 22:15:30 +02: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
|
8c80ad4040
|
Cleanup
|
2020-10-08 19:05:23 +02:00 |
|
TheBusyBiscuit
|
b05977c39b
|
[CI skip] Removed imports workflow
|
2020-10-08 19:04:23 +02:00 |
|
TheBusyBiscuit
|
5aa6a8b7b1
|
Removed github token from imports workflow
|
2020-10-08 19:01:28 +02:00 |
|
TheBusyBiscuit
|
d891d182b5
|
Intentionally messed up imports
|
2020-10-08 18:53:19 +02:00 |
|
TheBusyBiscuit
|
b6624bd43a
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags
|
2020-10-08 18:52:21 +02:00 |
|
TheBusyBiscuit
|
6f4802f7b6
|
[CI skip] Fixed imports workflow
|
2020-10-08 18:33:01 +02:00 |
|
TheBusyBiscuit
|
b399d0c942
|
Or maybe the ticks go here...
|
2020-10-08 18:30:35 +02:00 |
|
TheBusyBiscuit
|
3bcc00b62f
|
Perhaps we just need ticks
|
2020-10-08 18:29:59 +02:00 |
|
TheBusyBiscuit
|
cfc55038ea
|
Maybe this?
|
2020-10-08 18:29:24 +02:00 |
|
TheBusyBiscuit
|
488f1c626b
|
Update imports-fix.yml
|
2020-10-08 18:26:45 +02:00 |
|
TheBusyBiscuit
|
cdac03e411
|
Update imports-fix.yml
|
2020-10-08 18:25:57 +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
|
20405a775b
|
[CI skip] Added Imports cleanup action
|
2020-10-08 18:11:16 +02:00 |
|
TheBusyBiscuit
|
43284f1534
|
Merge branch 'master' into performance/cobblestone
|
2020-10-08 16:19:03 +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 |
|
LinoxGH
|
09a40d036e
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/EnergyNetComponent.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
|
2020-10-08 16:04:01 +03:00 |
|
LinoxGH
|
40caa2d574
|
Update ResearchSetup.java
|
2020-10-08 16:02:53 +03:00 |
|
LinoxGH
|
b5c917f719
|
Fixed the lore.
|
2020-10-08 16:00:26 +03:00 |
|
LinoxGH
|
4bf08db1d1
|
Merge branch 'master' into EnergyConnector
|
2020-10-08 15:53:08 +03: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 |
|