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

3801 Commits

Author SHA1 Message Date
TheBusyBiscuit
ced1580844 Translate researches_de.yml via GitLocalize 2020-06-09 21:26:07 +00:00
TheBusyBiscuit
b659e51008
Merge pull request #1953 from TheBusyBiscuit/feature/miner
Added Industrial Miner & Removed Digital Miner
2020-06-09 23:23:56 +02:00
TheBusyBiscuit
504df60a73
Merge pull request #1957 from TheBusyBiscuit/gitlocalize-12028
Added danish translations for categories
2020-06-09 23:23:18 +02:00
TheBusyBiscuit
d645fcc75b [CI skip] Updated translators list 2020-06-09 23:23:02 +02:00
TheBusyBiscuit
df947e0967 [CI skip] Refactoring 2020-06-09 23:21:37 +02:00
TheBusyBiscuit
013696a759
Merge branch 'master' into feature/miner 2020-06-09 00:12:33 +02:00
TheBusyBiscuit
a72c1c5b82 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-06-09 00:10:49 +02:00
TheBusyBiscuit
4f7b06be4c Changes to organic food/fertilizer 2020-06-09 00:10:32 +02:00
TheBusyBiscuit
abe8afab67 More balancing for Organic Food/Fertilizer 2020-06-08 23:25:45 +02:00
TheBusyBiscuit
bd712472d5 Balancing changes to Organic Food/Fertilizer, added cocoa variant 2020-06-08 23:13:44 +02:00
mt-gitlocalize
cb68c92dc5 Translate categories_da.yml via GitLocalize 2020-06-08 21:00:05 +00:00
Mini-kun
633f84178e Translate categories_da.yml via GitLocalize 2020-06-08 21:00:03 +00:00
TheBusyBiscuit
c8684bec66
[CI skip] Updated README 2020-06-08 14:48:56 +02:00
TheBusyBiscuit
70738a45ee Refactored recipe service for electric furnaces 2020-06-08 14:20:01 +02:00
TheBusyBiscuit
615e0c07a2 Minor changes 2020-06-07 17:48:10 +02:00
TheBusyBiscuit
7515aaaa62
[CI skip] Merge pull request #1954 from TheBusyBiscuit/gitlocalize-12012
Added hebrew resource translations
2020-06-05 20:21:56 +02:00
TheBusyBiscuit
586a6970ed
Updated translator list 2020-06-05 18:18:18 +02:00
Eylonnn
8ac61a9867 Translate resources_he.yml via GitLocalize 2020-06-05 16:15:30 +00:00
TheBusyBiscuit
e36d4d55f1
[CI skip] Merge pull request #1950 from TheBusyBiscuit/renovate/org.apache.maven.plugins-maven-shade-plugin-3.x
Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.2.4
2020-06-05 18:09:18 +02:00
TheBusyBiscuit
fcd17d3a5a Updated lore for advanced industrial miner 2020-06-05 14:37:31 +02:00
TheBusyBiscuit
8bde659daf The Advanced Miner now preserves buckets 2020-06-05 14:34:24 +02:00
TheBusyBiscuit
ae0b04788f Fixed Unit Tests 2020-06-05 14:25:47 +02:00
TheBusyBiscuit
fb58b5cf33 Updated changelog 2020-06-05 14:14:13 +02:00
TheBusyBiscuit
cd79775402 Added Advanced Industrial Miner 2020-06-05 14:13:53 +02:00
TheBusyBiscuit
e41eca9caa Refactoring 2020-06-05 14:09:32 +02:00
TheBusyBiscuit
15aabd6a63 Attributes are now hidden 2020-06-05 00:37:21 +02:00
TheBusyBiscuit
4f21fd03bc Finished Industrial Miner 2020-06-05 00:21:45 +02:00
TheBusyBiscuit
c8f78379a1 Added Industrial Miner 2020-06-05 00:00:07 +02:00
TheBusyBiscuit
4664fb00fe Added back researches 2020-06-04 23:59:58 +02:00
TheBusyBiscuit
aebd03301d Added new ItemStacks 2020-06-04 23:56:08 +02:00
TheBusyBiscuit
618bbfff24 Optimized Fuel 2020-06-04 23:55:53 +02:00
TheBusyBiscuit
7e8a63bff8 Dried Kelp Blocks are now valid coal generator fuel 2020-06-04 15:26:35 +02:00
TheBusyBiscuit
968b3df10a Relocated Multiblock class 2020-06-03 09:51:51 +02:00
Renovate Bot
fa4bc980cd
Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.2.4 2020-06-02 19:20:57 +00:00
TheBusyBiscuit
6c5e0447eb Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-06-02 15:19:56 +02:00
TheBusyBiscuit
31a9b69651 Refactored Backpacks 2020-06-02 13:58:03 +02:00
TheBusyBiscuit
595767ad03 Some cleanup 2020-06-02 13:50:29 +02:00
TheBusyBiscuit
7eee11f5d7
[CI skip] Another update to the README 2020-06-01 18:08:21 +02:00
TheBusyBiscuit
6da4cc6536 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-06-01 15:28:01 +02:00
TheBusyBiscuit
1984510971
[CI skip] Fixed a typo 2020-06-01 15:24:57 +02:00
TheBusyBiscuit
94df9f98f6
[CI skip] Spiced up the README once more 2020-06-01 15:21:39 +02:00
TheBusyBiscuit
4f7b18072e
[CI skip] Updated README again 2020-06-01 15:19:06 +02:00
TheBusyBiscuit
a61eb48186
[CI skip] Fixed details section 2020-06-01 15:16:31 +02:00
TheBusyBiscuit
64ed18fab9
[Ci skip] Updated README 2020-06-01 15:16:00 +02:00
TheBusyBiscuit
dd504b42f6
[CI skip] Updated README again 2020-06-01 15:13:22 +02:00
TheBusyBiscuit
f9a61a3ee7
[Ci skip] Updated README 2020-06-01 15:12:27 +02:00
TheBusyBiscuit
0faaef9b25 Removed Digital Miners 2020-06-01 14:10:22 +02:00
TheBusyBiscuit
f65ac6b68c Lava can no longer be used as a coolant for reactors 2020-06-01 14:02:49 +02:00
TheBusyBiscuit
2f09470b51 [Ci skip] Reduced technical debt 2020-06-01 13:52:04 +02:00
TheBusyBiscuit
89a0e6e4d0
Merge pull request #1946 from PhanaticD/PhanaticD-patch-memoryleak
remove metadata on entity death, and when items are removed from pede…
2020-06-01 10:53:19 +02:00