DODSORFAS
/
minecraft-datapacks
1
0
Fork 0
Code Issues 15 Pull Requests 2 Projects Releases Wiki Activity
Datapacks for minecraft
112 Commits 8 Branches 0 Tags 14 MiB
mcfunction 100%
Go to file
Daniel Løvbrøtte Olsen 0a90343dd0 Merge branch '1.15' into 'master' 
Update 1.15

See merge request dodsorfas/minecraft-datapacks!10
 		2020-02-24 00:28:39 +00:00
datapacks Deleted datapacks/enchantment_merger/data/ench_merger/functions/merge/check_all.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_bow.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_carrot_on_a_stick.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_crossbow.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_axe.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_boots.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_chestplate.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_helmet.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_hoe.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_leggings.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_pickaxe.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_shovel.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_diamond_sword.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_elytra.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_fishing_rod.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_flint_and_steel.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_shears.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_shield.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_trident.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/check_turtle_shell.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/finish.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_bow.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_carrot_on_a_stick.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_crossbow.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_axe.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_boots.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_chestplate.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_helmet.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_hoe.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_leggings.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_pickaxe.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_shovel.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_diamond_sword.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_elytra.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_fishing_rod.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_flint_and_steel.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_shears.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_shield.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_trident.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/merge_turtle_shell.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merge/setup.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merger/check_combine.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merger/check_combine_start.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merger/check_destroy.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merger/combine.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merger/destroy.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/merger/particle.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/aqua_affinity.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/bane_of_arthropods.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/binding_curse.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/blast_protection.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/channeling.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/depth_strider.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/efficiency.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/feather_falling.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/fire_aspect.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/fire_protection.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/flame.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/fortune.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/frost_walker.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/impaling.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/infinity.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/knockback.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/looting.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/loyalty.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/luck_of_the_sea.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/lure.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/mending.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/multishot.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/piercing.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/power.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/projectile_protection.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/protection.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/punch.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/quick_charge.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/respiration.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/riptide.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/sharpness.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/silk_touch.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/smite.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/sweeping.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/thorns.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/unbreaking.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/recipes/vanishing_curse.mcfunction, datapacks/enchantment_merger/data/ench_merger/functions/init.mcfunction, datapacks/enchantment_merger/data/fh_main/functions/init.mcfunction, datapacks/enchantment_merger/data/fh_main/functions/tick.mcfunction, datapacks/enchantment_merger/data/fh_main/tags/functions/five_second.json, datapacks/enchantment_merger/data/fh_main/tags/functions/half_second.json, datapacks/enchantment_merger/data/fh_main/tags/functions/init.json, datapacks/enchantment_merger/data/fh_main/tags/functions/second.json, datapacks/enchantment_merger/data/fh_main/tags/functions/tick.json, datapacks/enchantment_merger/data/fh_main/tags/functions/two_and_half_second.json, datapacks/enchantment_merger/data/minecraft/tags/functions/load.json, datapacks/enchantment_merger/data/minecraft/tags/functions/tick.json, datapacks/enchantment_merger/pack.mcmeta files 2019-11-15 14:19:51 +00:00
plugins Add Minetrix bridge to replace dodsorbot 2019-09-11 10:57:26 +00:00
resourcepack Update Vanilla Tweaks to 1.15 2019-12-19 11:07:36 +01:00
.gitlab-ci.yml Update .gitlab-ci.yml 2019-09-13 15:38:22 +00:00
README.md Update README.md 2019-05-22 10:12:04 +00:00

README.md

Minecraft Datapacks

Datapacks for minecraft

Steps to change datapacks

Fixes can go straight to master, all other changes are to be done like the following:

  1. Write up a proposal for what to change as an issue
  2. Get feedback
  3. Branch from master and add/change datapacks needed to fix in that branch.
  4. TEST
  5. Enter final comment period for the MC, no major changes unless its a really good idea
  6. merge to master