mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Code Releases Activity
5,464 Commits 1 Branch 0 Tags 64 MiB
fada355fe5
Commit Graph

5464 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
LinoxGH
49eca61a27
Changed HeadTexture. 2020-10-10 15:21:44 +03:00
LinoxGH
729facab61
Added Energy Connector texture. 2020-10-10 15:18:55 +03: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
47bcee9d65
[CI skip] URL checks are now push-only 2020-10-10 01:28:43 +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
27a2416f31
[CI skip] Merge pull request #2419 from Slimefun/gitlocalize-13346 
Updated Turkish Translations
 2020-10-10 01:23:31 +02:00
TheBusyBiscuit
7cf01a5b92
[CI skip] Nope 2020-10-09 20:49:10 +02:00
TheBusyBiscuit
ab1dc57336
[CI skip] trying out this workflow again 2020-10-09 20:42:26 +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
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
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
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
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
20405a775b
[CI skip] Added Imports cleanup action 2020-10-08 18:11:16 +02:00
TheBusyBiscuit
2d00f3e704
Merge branch 'master' into tags 2020-10-08 16:16:11 +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