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,594 Commits 1 Branch 0 Tags 64 MiB
b8dfa5908b
Commit Graph

3592 Commits

Author SHA1 Message Date
Daniel Walsh
b8dfa5908b
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/LearningAnimationOption.java 2021-05-12 11:36:11 +01:00
Martin Brom
4a6cfd9a85 Revert changes to FireworksOption 
Change item in LearningAnimationOption to a map when enabled
 2021-05-11 22:22:17 +02:00
Martin Brom
5817bf16fd Change annotations to Nonnull 2021-05-11 22:01:29 +02:00
Martin Brom
d1aac2e291 Add enchantment to FireworksOption and LearningAnimationOption when enabled 
Add minecraft alias
 2021-05-11 21:54:33 +02:00
Martin Brom
8ac9160e37 Add unicode arrow to the message 2021-05-06 18:18:26 +02:00
Martin Brom
e7ae14beaf Add locale message for learning animation option 
Add helper function to get value of selected option in the survival guide
 2021-05-06 18:18:26 +02:00
Martin Brom
fd12521a0a Add requested changes 
Revert change in research test
 2021-05-06 18:18:26 +02:00
Martin Brom
227621906c Add the option to disable learning animations server & client side 2021-05-06 18:18:26 +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
The Busy Bot
d037b600d9 New translations messages.yml (Vietnamese) 2021-05-06 11:13:16 +02:00
The Busy Bot
18830894c2 New translations researches.yml (German) 2021-05-05 18:42:22 +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
7e74c5a8b2 Correction of wrongly spelled words. 2021-05-04 04:52:58 +00:00
TheBusyBiscuit
e51fcde16f
Update OutputChest.java 2021-05-03 15:28:11 +02:00
TheBusyBiscuit
c29d0e5530 Fixed #3012 2021-05-03 13:05:22 +02:00
TheBusyBiscuit
df7b262d14 Fixed #3007 2021-05-01 00:09:38 +02:00
TheBusyBiscuit
a0695e0df4
Merge pull request #2994 from Mooy1/android-click-fix 
Fix android click handler errors while moving
 2021-04-30 12:51:34 +02:00
TheBusyBiscuit
5f1aeecdbf [CI skip] Updated changelog 
Also fixed MultiCategory not respecting guide main page index.
 2021-04-30 12:51:22 +02:00
TheBusyBiscuit
e609e9e0ae
Merge pull request #2993 from Mooy1/guide-history-fix 
Fixed #2593
 2021-04-30 12:36:47 +02:00
TheBusyBiscuit
8c0fbfb295 More refactoring 2021-04-30 11:22:18 +02:00
TheBusyBiscuit
2382b940f1 Refactoring 2021-04-30 10:54:40 +02:00
TheBusyBiscuit
b92de66a27 [CI skip] Added missing import 2021-04-30 10:32:57 +02:00
TheBusyBiscuit
c215940cb9 Marked some items as unplaceable 2021-04-29 21:18:32 +02:00
TheBusyBiscuit
586e0516cf [Ci skip] Some refactoring 2021-04-29 20:48:05 +02:00
TheBusyBiscuit
ced3cf9f50 Removed some deprecated methods 2021-04-29 20:37:54 +02:00
TheBusyBiscuit
90c8e2f278 Fixes #2999 2021-04-29 17:52:21 +02:00
a
a1619206ea Update ProgrammableAndroid.java 2021-04-27 09:36:16 -05:00
a
bf5ada4eab Update ProgrammableAndroid.java 2021-04-27 09:34:52 -05:00
a
f79840bf66 changes 2021-04-27 09:26:56 -05:00
Riley
31ddf8e7de
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-04-26 18:55:24 -05:00
a
a1a6253961 Update ProgrammableAndroid.java 2021-04-26 18:43:10 -05:00
a
61ff68d34a fix 2021-04-26 18:15:07 -05:00
TheBusyBiscuit
757d7613ac [CI skip] Formatting 2021-04-26 18:06:25 +02:00
Rothes
a59f5cb067 Update 2021-04-26 17:20:44 +08:00
Rothes
ff58e53145 Update 2021-04-26 15:17:39 +08:00
Rothes
205f8d02b1
Merge branch 'master' into master 2021-04-26 12:28:03 +08:00
TheBusyBiscuit
f048d0276b
Merge pull request #2982 from martinbrom/fix/auto-enchanter-fixed-order 
Fixes #2977
 2021-04-25 20:13:59 +02:00
TheBusyBiscuit
a7835197a5 Some minor code improvements 2021-04-25 20:13:51 +02:00
TheBusyBiscuit
d91d9c2856 Removed Automated Crafting Chamber 2021-04-25 19:49:17 +02:00
TheBusyBiscuit
bffef56407 Added Category#setTier() 2021-04-25 19:47:58 +02:00
TheBusyBiscuit
c975fe234e Fixed #2989 2021-04-25 19:29:57 +02:00
Daniel Walsh
2f27ddc6a6
Merge pull request #2988 from martinbrom/fix/talisman-of-the-anvil 
Fixes NPE when hand is empty while talisman of the anvil triggers
 2021-04-24 12:22:59 +01:00
Martin Brom
a6f3696719 Fixes NPE when hand is empty while talisman of the anvil triggers 
Resolves #2987
 2021-04-24 12:22:40 +02:00
TheBusyBiscuit
1c5372d261 Complete restructure of language files 2021-04-23 20:48:24 +02:00
TheBusyBiscuit
1982ec0aeb Reorganized language files 2021-04-23 19:22:25 +02:00
TheBusyBiscuit
34421d4a12 More refactoring 2021-04-23 19:01:41 +02:00
TheBusyBiscuit
a3a9ee4b90 Various code improvements 2021-04-23 18:58:35 +02:00
TheBusyBiscuit
8aeda66c5e Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 
Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AbstractSmeltery.java
 2021-04-23 18:30:12 +02:00