Commit Graph

48 Commits (c5a3944b4818a28d8ed9ba96d5deacb44b986d1f)

Author SHA1 Message Date
kalle c5a3944b48 Remove extra white space from README.md 2020-07-28 09:17:31 +00:00
kalle 41727b8815 Trigger Rebuild. 2020-03-15 18:33:18 +00:00
dragontamerfred 35bb99e38d Trigger rebuild. 2020-01-16 20:21:19 +00:00
dragontamerfred 4bfa4e2e04 Make merge requests also run the automatic build. Should help to avoid commits that don't compile being merged. 2019-10-17 06:35:43 +00:00
dragontamerfred 835c8dd257 Fix missing semicolon in config.java. 2019-10-17 06:31:56 +00:00
LuukFTF f904e7bc11 Merge branch 'LuukFTF-master-patch-09275' into 'master'
Luuk ftf master patch 09275

See merge request dragontamerfred/vanilla-tweaks!6
2019-10-16 21:44:19 +00:00
LuukFTF bf88fef70e Merge branch 'master' into 'LuukFTF-master-patch-09275'
# Conflicts:
#   README.md
2019-10-16 21:42:17 +00:00
LuukFTF 103c7a8bd4 Update src/main/java/nl/kallestruik/vanillatweaks/CraftingTweaks/CraftingTweaks.java 2019-10-16 21:39:33 +00:00
LuukFTF a1ae4a3d6b Added shulker shell recipe 2019-10-16 23:32:11 +02:00
dragontamerfred f4ba456cfb Update README.md 2019-10-14 20:41:02 +00:00
LuukFTF eb36394232 Merge branch 'master' into 'master'
Master

See merge request LuukFTF/vanilla-tweaks!1
2019-10-14 13:20:41 +00:00
LuukFTF feb0d01088 Update CraftingTweaks.java 2019-10-13 18:29:18 +00:00
LuukFTF 61c7fb2cfc Update config.java 2019-10-13 18:28:03 +00:00
LuukFTF 4f15e3b716 Merge branch 'master' into 'master'
LuukFTF was stupid.

See merge request dragontamerfred/vanilla-tweaks!4
2019-10-13 18:12:29 +00:00
LuukFTF 4201ed6d16 LuukFTF was stupid. 2019-10-13 20:09:46 +02:00
LuukFTF 7871bf40c0 Merge branch 'master' into 'master'
Added alternative crafting recipe for dispenser.

See merge request dragontamerfred/vanilla-tweaks!3
2019-10-13 17:28:31 +00:00
LuukFTF 4fc321a426 Added alternative crafting recipe for dispenser. 2019-10-13 18:18:23 +02:00
dragontamerfred c98dae2854 Add lily pad growing. Fix some warnings. Bump version number. 2019-10-08 20:34:29 +02:00
dragontamerfred f2bc30cd5d Add lily pad growing. Fix some warnings. Bump version number. 2019-10-08 20:34:13 +02:00
dragontamerfred 586fd9122d Merge branch 'master' into 'master'
Added crafting recipe for sponge.

See merge request dragontamerfred/vanilla-tweaks!2
2019-10-05 08:32:02 +00:00
LuukFTF dbf86b2b4a Added crafting recipe for sponge. 2019-10-05 01:52:55 +02:00
dragontamerfred 49b3e07cc5 Update .gitlab-ci.yml. 2019-10-05 01:37:37 +02:00
dragontamerfred dcf8d3582b Update gradlew. 2019-10-05 01:35:13 +02:00
dragontamerfred 15ef4b6241 Oops forgot about .gitignore 2019-10-05 01:34:17 +02:00
dragontamerfred c957ed8e89 Fix gradle? 2019-10-05 01:32:20 +02:00
dragontamerfred 653f9b9a19 Update gradlew. 2019-10-05 01:28:10 +02:00
dragontamerfred 95fc614b94 Update .gitlab-ci.yml 2019-10-05 01:21:55 +02:00
dragontamerfred 90bb7b67ac Update .gitlab-ci.yml 2019-10-05 01:20:14 +02:00
dragontamerfred 49a49f2416 Update .gitlab-ci.yml 2019-10-05 01:18:44 +02:00
dragontamerfred 7a0ced22ce Update .gitlab-ci.yml 2019-10-05 01:14:01 +02:00
dragontamerfred 21ad306c68 Update .gitlab-ci.yml 2019-10-04 23:05:15 +00:00
dragontamerfred 7391eef0e8 Add gradle files to git for automatic building. 2019-10-05 01:02:55 +02:00
dragontamerfred e3ec1982d0 Update .gitlab-ci.yml 2019-10-04 23:00:39 +00:00
dragontamerfred 70eb164834 Add .gitlab-ci.yml 2019-10-04 22:58:56 +00:00
dragontamerfred 58de1c680c Merge branch 'master' into 'master'
Added crafting recipe for dragons breath. Fixed typo.

See merge request dragontamerfred/vanilla-tweaks!1
2019-10-04 22:47:01 +00:00
LuukFTF e3db5f892c Added crafting recipe for dragons breath. Fixed typo. 2019-10-05 00:43:40 +02:00
dragontamerfred b6740b9de3 Add hoe harvesting. 2019-10-04 19:01:03 +02:00
dragontamerfred 12216e6e7e Fix stupid typo. 2019-10-03 19:35:47 +02:00
dragontamerfred 43aee539c4 Add recipes for packed ice and normal ice (from blue and packed ice) 2019-10-03 19:01:48 +02:00
dragontamerfred 94366f74d2 Fix bug with seed drop planting. 2019-10-03 18:47:23 +02:00
dragontamerfred 4a1793b2e1 Add nether sponge drying.
Fix bug with armor stand swapping.
Fix bug with seed drop planting.
2019-10-03 17:41:20 +02:00
dragontamerfred 6d78b656de Add armor stand swapping 2019-10-02 19:49:30 +02:00
dragontamerfred 774f7d449f Add automatic planting of dropped seeds. 2019-10-02 19:15:41 +02:00
dragontamerfred 36ded4ce9f Add Crafting tweaks. 2019-10-02 16:48:21 +02:00
dragontamerfred 4f68824718 Refactor project structure. Yes I know this was fast. 2019-10-02 15:11:35 +02:00
dragontamerfred 15d19259cc Add LICENSE 2019-10-02 13:10:38 +00:00
dragontamerfred 3a76e0f34c Add README.md 2019-10-02 13:08:03 +00:00
dragontamerfred 013b4d1dde Initial commit. 2019-10-02 14:59:00 +02:00