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
6,181 Commits 1 Branch 0 Tags 64 MiB
9aa3acde02
Commit Graph

6181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheBusyBiscuit
c2da6c5f53 Changed recipe for Tier 3 electric ore grinder 2021-01-26 00:57:49 +01:00
TheBusyBiscuit
7d0168115f
Merge pull request #2599 from svr333/AddT3ElectricGrinder 
Add Tier 3 Electric Ore Grinder
 2021-01-26 00:56:19 +01:00
TheBusyBiscuit
2085d9eeba [CI skip] Updated changelog 2021-01-26 00:56:03 +01:00
TheBusyBiscuit
d78e82cf05
[CI skip] Removed trailing spaces 2021-01-25 18:47:15 +01:00
TheBusyBiscuit
e150444c24
[CI skip] Fixed alignment 2021-01-25 18:44:52 +01:00
TheBusyBiscuit
904cebeccb
[CI skip] Exclude our other actions from this one 2021-01-25 18:44:21 +01:00
TheBusyBiscuit
3994111a77
[CI skip] Updated workflow 2021-01-25 18:34:18 +01:00
TheBusyBiscuit
dd251fe29a
[CI skip] Test out automatic responses 2021-01-25 18:30:47 +01:00
TheBusyBiscuit
ea8642d313
[CI skip] Merge pull request #2627 from WalshyDev/feature/pr-labels 
Added PR labels
 2021-01-25 18:18:56 +01:00
Daniel Walsh
423125a888
Updated pr-labels to 1.1 2021-01-25 16:20:19 +00:00
TheBusyBiscuit
8d85ce2720
Update CHANGELOG.md 2021-01-25 16:46:52 +01:00
Daniel Walsh
91aaa546a6
Merge pull request #2680 from ProfElements/master 2021-01-25 15:44:06 +00:00
TheBusyBiscuit
36fe08a349
Merge pull request #2765 from StarWishsama/2761 
Fixes #2761 probably
 2021-01-25 16:36:49 +01:00
TheBusyBiscuit
3e5926c5c2
Update CHANGELOG.md 2021-01-25 16:36:24 +01:00
TheBusyBiscuit
30202d3f51
Merge pull request #2755 from kii-chan-reloaded/master 
Check inv maxStackSize
 2021-01-25 16:34:47 +01:00
TheBusyBiscuit
9f29901eb8
[CI skip] Updated translators list 2021-01-25 15:46:35 +01:00
Name1ess
f3fafabcff
Update TalismanListener.java 2021-01-25 20:10:35 +08:00
TheBusyBiscuit
95144e999f
Update pr-labels.yml 2021-01-25 12:39:46 +01:00
TheBusyBiscuit
da6727195d
Update .github/workflows/pr-labels.yml 2021-01-25 12:37:37 +01:00
TheBusyBiscuit
5ac3b9ec53
[CI skip] Merge pull request #2766 from Slimefun/gitlocalize-14860 
Updated Hungarian translations
 2021-01-25 12:25:58 +01:00
TheBusyBiscuit
842308cce7
[CI skip] Merge pull request #2762 from Slimefun/gitlocalize-14855 
Update Japanese translation files.
 2021-01-25 12:25:13 +01:00
TheBusyBiscuit
3e1e6b6ad6
[CI skip] Merge pull request #2764 from Slimefun/gitlocalize-14857 
Update zh-CN translation
 2021-01-25 12:24:40 +01:00
poma123
290afb4746 Translate researches_hu.yml via GitLocalize 2021-01-25 08:04:24 +00:00
KingDead
6792ee765f Translate messages_hu.yml via GitLocalize 2021-01-25 08:04:22 +00:00
poma123
e47b89de4e Translate messages_hu.yml via GitLocalize 2021-01-25 08:04:21 +00:00
András Marczinkó
28f0b44f3c Translate messages_hu.yml via GitLocalize 2021-01-25 08:04:20 +00:00
StarWishsama
a6bcab266f chore: remove register call when initialize 2021-01-25 12:18:24 +08:00
Name1ess
8d844254c2
fix: register recipes when speed is not 0 2021-01-25 12:15:18 +08:00
Nameless
76ebff105b Translate researches_zh-CN.yml via GitLocalize 2021-01-25 04:06:01 +00:00
Nameless
89370d31f9 Translate messages_zh-CN.yml via GitLocalize 2021-01-25 04:05:59 +00:00
StarWishsama
decf9bd08c fix: grammar issue 2021-01-25 11:59:53 +08:00
TheBusyBiscuit
c6c02ccc48
[CI skip] Merge pull request #2763 from Slimefun/gitlocalize-14856 
Translated the new string
 2021-01-25 00:27:00 +01:00
Nikolay
3b564c0486 Translate messages_bg.yml via GitLocalize 2021-01-24 22:55:41 +00:00
bito-blosh
826e90ef82 Translate messages_ja.yml via GitLocalize 2021-01-24 21:22:01 +00:00
TheBusyBiscuit
c9cdffdfac Translate messages_ja.yml via GitLocalize 2021-01-24 21:22:00 +00:00
bito-blosh
ce869b2acc Translate researches_ja.yml via GitLocalize 2021-01-24 21:21:58 +00:00
TheBusyBiscuit
355a8bbabd
[CI skip] Merge pull request #2759 from Slimefun/gitlocalize-14854 
Updated german translations
 2021-01-24 20:30:22 +01:00
TheBusyBiscuit
1c4c9caf2e Translate recipes_de.yml via GitLocalize 2021-01-24 19:27:26 +00:00
TheBusyBiscuit
abf948e4ed Translate messages_de.yml via GitLocalize 2021-01-24 19:27:24 +00:00
TheBusyBiscuit
e5d5b2950d Translate researches_de.yml via GitLocalize 2021-01-24 19:27:23 +00:00
TheBusyBiscuit
54e69dfb9f
[CI skip] Merge pull request #2758 from Slimefun/gitlocalize-14853 
recipes_es / researches_es / messages_es
 2021-01-24 20:24:28 +01:00
TheBusyBiscuit
a9c4df30a4
Update Translators.java 2021-01-24 20:23:30 +01:00
Vravinite
352d1c0823 Translate recipes_es.yml via GitLocalize 2021-01-24 19:21:48 +00:00
Luu7
794d184a41 Translate researches_es.yml via GitLocalize 2021-01-24 19:21:47 +00:00
Luu7
0da0468b23 Translate messages_es.yml via GitLocalize 2021-01-24 19:21:46 +00:00
dylan
cd643cabb5 Translate messages_es.yml via GitLocalize 2021-01-24 19:21:45 +00:00
TheBusyBiscuit
f958385f3d Translate messages_es.yml via GitLocalize 2021-01-24 19:21:44 +00:00
TheBusyBiscuit
4019b9612d
Merge branch 'master' into master 2021-01-24 18:09:40 +01:00
TheBusyBiscuit
0b4c2f2e08 Cherry-picked Talisman of the Wise from #2645 2021-01-24 18:04:52 +01:00
TheBusyBiscuit
f6e9d70baa Merge branch 'feature/experimental-talismans' of https://github.com/Slimefun/Slimefun4.git 2021-01-24 17:03:14 +01:00