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

6608 Commits

Author SHA1 Message Date
Daniel Walsh
e7ef924bf8
Merge pull request #3033 from variananora/fix/auto-disenchanter-strict-slot-order 2021-05-09 14:58:39 +01:00
Varian Anora
10e3df78b8 Merge branch 'master' into fix/auto-disenchanter-strict-slot-order 2021-05-09 19:00:30 +07:00
Varian Anora
f5d1d3a947 Revert swapping item and secondItem 2021-05-09 18:59:54 +07:00
TheBusyBiscuit
27224c55eb
Updated default item models file 2021-05-08 19:24:16 +02:00
TheBusyBiscuit
81223004bf Default values for item models are now read from a resource file. 2021-05-08 19:22:54 +02:00
Varian Anora
8d3d24bc5f Revert to EnchantmentStorageMeta 2021-05-08 12:08:56 +07:00
Varian Anora
716c384349 Merge branch 'master' into fix/auto-disenchanter-strict-slot-order 2021-05-08 12:06:55 +07:00
TheBusyBiscuit
96f467d9f1
[CI skip] Fixed yaml linter issues 2021-05-07 14:32:15 +02:00
TheBusyBiscuit
e64028486f [CI skip] Added autosquash workflow for Crowdin PRs 2021-05-07 14:26:53 +02:00
TheBusyBiscuit
5194dbb1db
Merge pull request #3031 from variananora/fix/pickaxe-of-the-seeker-localization
Update Pickaxe of The Seeker Localization
2021-05-07 14:14:51 +02:00
TheBusyBiscuit
4e417a89a0
[CI skip] Merge pull request #3029 from Slimefun/crowdin/master
New Crowdin updates
2021-05-07 14:13:55 +02:00
TheBusyBiscuit
295d3dae76
[CI skip] Updated changelog 2021-05-07 14:13:15 +02:00
TheBusyBiscuit
13c6d5d273
Merge pull request #3032 from martinbrom/feature/lump-grinding
Add grinding of higher level lumps back into 4 lower level lumps
2021-05-07 14:11:09 +02:00
TheBusyBiscuit
9f9ae687a7
[CI skip] Updated changelog 2021-05-07 14:10:54 +02:00
Varian Anora
847bab7a86 Fixes #2978
Fix is stolen from #2982
2021-05-07 10:19:36 +07:00
Martin Brom
e7662dd04f Add grinding of higher level lumps back into 4 lower level lumps 2021-05-06 18:40:19 +02:00
TheBusyBiscuit
a4aebf7bcd [CI skip] Translators are now read from a json file.
Next step is writing a GitHub action that auto-populates that file via
the Crowdin API
2021-05-06 15:56:55 +02:00
Varian Anora
cc714b1722 Update Pickaxe of The Seeker Localization
Moved locale path to follow current styling
Added Pickaxe of The Seeker error message when no ores were found.
2021-05-06 20:02:35 +07:00
TheBusyBiscuit
3e01e24b12
Update src/main/resources/languages/lv/messages.yml
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-05-06 13:20:17 +02:00
The Busy Bot
e084cf0fff New translations researches.yml (Czech) 2021-05-06 12:59:04 +02:00
The Busy Bot
3a1da2a131 New translations messages.yml (Latvian) 2021-05-06 12:52:15 +02:00
The Busy Bot
b75f0a613b New translations recipes.yml (German) 2021-05-06 12:45:23 +02:00
The Busy Bot
7da4e1962e New translations messages.yml (German) 2021-05-06 12:45:22 +02:00
Daniel Walsh
bea34966c1
[CI Skip] Merge pull request #3028 from Slimefun/crowdin/master
New Crowdin updates
2021-05-06 11:43:41 +01:00
The Busy Bot
d037b600d9 New translations messages.yml (Vietnamese) 2021-05-06 11:13:16 +02:00
TheBusyBiscuit
8d0b5c9d27
[CI skip] Merge pull request #3026 from Slimefun/crowdin/master
New Crowdin updates
2021-05-05 18:56:29 +02:00
TheBusyBiscuit
b51584fddf
[CI skip] Make yaml-linter happy 2021-05-05 18:54:10 +02:00
The Busy Bot
18830894c2 New translations researches.yml (German) 2021-05-05 18:42:22 +02:00
TheBusyBiscuit
74a93741cc [CI skip] Updated workflows 2021-05-05 18:26:27 +02:00
TheBusyBiscuit
8a1eba8fd4 [CI skip] Crowdin setup (squashed) 2021-05-05 18:10:02 +02:00
Freeze_Dolphin
c48ccc0149 Correction of wrongly spelled words. 2021-05-04 07:33:32 +00:00
Freeze_Dolphin
51b72d4dba Revert "Correction of wrongly spelled words."
This reverts commit 7e74c5a8b2.
2021-05-04 07:32:38 +00:00
Freeze_Dolphin
2c06f29066 Merge branch 'master' of https://github.com/freeze-dolphin/Slimefun4 2021-05-04 07:29:12 +00:00
Freeze_Dolphin
467075120a Correction of wrongly spelled words. 2021-05-04 07:28:55 +00:00
Freeze_Dolphin
7e74c5a8b2 Correction of wrongly spelled words. 2021-05-04 04:52:58 +00:00
TheBusyBiscuit
fafdf0a983
[CI skip] Merge pull request #3014 from Slimefun/renovate/com.github.thebusybiscuit-cs-corelib2-0.x
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.31.0
2021-05-03 15:30:47 +02:00
TheBusyBiscuit
e51fcde16f
Update OutputChest.java 2021-05-03 15:28:11 +02:00
Renovate Bot
0ceaf905f0
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.31.0 2021-05-03 13:24:57 +00:00
TheBusyBiscuit
c29d0e5530 Fixed #3012 2021-05-03 13:05:22 +02:00
TheBusyBiscuit
fd877211ec
[CI skip] Updated issues beta template 2021-05-01 10:39:20 +02:00
TheBusyBiscuit
adcea780a7
[CI skip] Removed asterisk from template 2021-05-01 10:37:09 +02:00
TheBusyBiscuit
87336b1a8b
[CI skip] Updated issues beta footer 2021-05-01 10:32:23 +02:00
TheBusyBiscuit
11ecd9cb8b
[CI skip] Added extra line to the issues template 2021-05-01 10:28:59 +02:00
TheBusyBiscuit
7cd4b301a3
[CI skip] Updated issues beta template 2021-05-01 10:28:16 +02:00
TheBusyBiscuit
c6cc244438
[CI skip] Updated issues beta template 2021-05-01 10:24:22 +02:00
TheBusyBiscuit
303a78edd7
[CI skip] Updated issues beta template 2021-05-01 10:23:31 +02:00
TheBusyBiscuit
770b9fbf4f
[CI skip] Merge pull request #3006 from Slimefun/issue-forms-header
Add a new header pointing to existing issues and Discord
2021-05-01 10:18:34 +02:00
TheBusyBiscuit
e678daf224
Added another checkbox 2021-05-01 10:16:56 +02:00
TheBusyBiscuit
b3875b59ae
This is a pretty important point actually 👀 2021-05-01 00:39:35 +02:00
TheBusyBiscuit
df7b262d14 Fixed #3007 2021-05-01 00:09:38 +02:00