DODSORFAS/minecraft-datapacks
1
0
Fork 0
Code Issues 15 Pull Requests 2 Projects Releases Wiki Activity
121 Commits 8 Branches 0 Tags
master
Commit Graph
99 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Løvbrøtte Olsen e5e96a43a2 Merge branch 'MC-025' into 'master' 
MC-025

Closes #25

See merge request dodsorfas/minecraft-datapacks!13
 2020-03-19 14:59:47 +00:00
Daniel Løvbrøtte Olsen 53d88fc3be Merge branch 'MC-024' into 'master' 
Add wandering_trader

Closes #24

See merge request dodsorfas/minecraft-datapacks!12
 2020-03-16 12:16:08 +00:00
Daniel Løvbrøtte Olsen 3bd459326e zip is being a dumb dumb 2020-02-24 08:39:20 +00:00
Daniel Løvbrøtte Olsen 5b9b55085c rename to lower case 2020-02-24 08:36:47 +00:00
Daniel Løvbrøtte Olsen ef7749c7f1 Merge branch 'MC-012A' into 'master' 
MC-12A Bats

Closes #12

See merge request dodsorfas/minecraft-datapacks!11
 2020-02-24 08:29:50 +00:00
Daniel Løvbrøtte Olsen 4b73c48cd2 Add voodo's bat membrane datapack 2020-02-24 08:28:30 +00:00
Daniel Løvbrøtte Olsen d8e6b96440 delete unused plugins 2020-02-24 01:31:29 +00:00
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
Daniel Løvbrøtte Olsen 5cc48aa822 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
Daniel Løvbrøtte Olsen 71bde517f2 Update dansbrain.json 2019-10-18 09:17:07 +00:00
Daniel Løvbrøtte Olsen 9a4d9087d7 Update adv5.json -> brain 2019-10-18 09:14:16 +00:00
Daniel Løvbrøtte Olsen 6491a97b04 Update adv5.json 2019-10-18 09:01:46 +00:00
Daniel Løvbrøtte Olsen e9a32813c2 Update .gitlab-ci.yml 2019-09-13 15:38:22 +00:00
Daniel Løvbrøtte Olsen 88fc2fb988 Merge branch '1.14' into 'master' 
1.14

See merge request dodsorfas/minecraft-datapacks!9
 2019-09-13 15:33:50 +00:00
Daniel Løvbrøtte Olsen e3b1811c0f Merge branch '1.14' into 'master' 
1.14

See merge request dodsorfas/minecraft-datapacks!8
 2019-09-13 15:17:39 +00:00
Daniel Løvbrøtte Olsen 46ebec8655 fix black_wool_improved.json 2019-09-11 12:17:32 +00:00
Daniel Løvbrøtte Olsen 7d9624cfac Add Minetrix bridge to replace dodsorbot 2019-09-11 10:57:26 +00:00
Daniel Løvbrøtte Olsen 477c02b778 Update .gitlab-ci.yml 2019-08-26 09:58:18 +00:00
Daniel Løvbrøtte Olsen fde4132c56 Acyclic Graphs 2019-08-26 09:13:57 +00:00
Daniel Løvbrøtte Olsen c67936c9ba Merge branch 'MC-011' into 'master' 
MC-011: 1.14 beta textures 3.3

Closes #11

See merge request dodsorfas/minecraft-datapacks!7
 2019-08-18 02:30:46 +00:00
Daniel Løvbrøtte Olsen 974c8ee1b3 Update .gitlab-ci.yml (pages) 2019-08-18 02:29:47 +00:00
Daniel Løvbrøtte Olsen 4065f1790a Update .gitlab-ci.yml 2019-08-15 18:43:34 +00:00
Daniel Løvbrøtte Olsen dfb7688b07 Merge branch 'MC-010' into 'master' 
MC-010: Transparent pumpkin overlay

See merge request dodsorfas/minecraft-datapacks!6
 2019-08-15 14:43:28 +00:00
Daniel Løvbrøtte Olsen bc6ee171ff Update .gitlab-ci.yml 2019-08-08 06:59:34 +00:00
Daniel Løvbrøtte Olsen 46933bb4b7 Update .gitlab-ci.yml 2019-08-08 06:56:43 +00:00
Daniel Løvbrøtte Olsen 7df7b4567e Update .gitlab-ci.yml 2019-08-08 06:51:23 +00:00
Daniel Løvbrøtte Olsen 5eb52e121e Update .gitlab-ci.yml 2019-08-08 06:42:43 +00:00
Daniel Løvbrøtte Olsen 28c4fb165b Update .gitlab-ci.yml 2019-08-08 06:36:26 +00:00
Daniel Løvbrøtte Olsen 7ae9cc7e7f Update .gitlab-ci.yml 2019-08-08 06:31:16 +00:00
Daniel Løvbrøtte Olsen 80e426910d Update .gitlab-ci.yml 2019-08-08 06:29:16 +00:00
Daniel Løvbrøtte Olsen bcd0e6cf7a Update .gitlab-ci.yml 2019-08-08 06:26:34 +00:00
Daniel Løvbrøtte Olsen 3c9238ff74 Update .gitlab-ci.yml 2019-08-08 06:22:41 +00:00
Daniel Løvbrøtte Olsen b25706e576 Update .gitlab-ci.yml 2019-08-08 06:16:51 +00:00
Daniel Løvbrøtte Olsen 635aa4bb11 Update .gitlab-ci.yml 2019-08-08 06:00:23 +00:00
Daniel Løvbrøtte Olsen c0513b7f53 Update .gitlab-ci.yml 2019-08-08 05:50:09 +00:00
Daniel Løvbrøtte Olsen 67dcec4ae0 Update .gitlab-ci.yml 2019-08-08 05:46:45 +00:00
Daniel Løvbrøtte Olsen bf0f0c309f Update .gitlab-ci.yml 2019-08-08 05:24:52 +00:00
Daniel Løvbrøtte Olsen a70bbbc77e Update .gitlab-ci.yml 2019-08-08 05:06:42 +00:00
Daniel Løvbrøtte Olsen 17e79f9a3d Incorporate plugins and config 
Modularize gitlab-ci
 2019-08-08 05:05:31 +00:00
Daniel Løvbrøtte Olsen a4518a93b5 Merge branch 'MC-007' into 'master' 
MC-007 - add uncrafting quartz and nether wart

Closes #7

See merge request dodsorfas/minecraft-datapacks!5
 2019-08-01 00:35:45 +00:00
Daniel Løvbrøtte Olsen a9affd2a4c Update .gitlab-ci.yml 2019-07-31 10:08:01 +00:00
Daniel Løvbrøtte Olsen 073bb8ea6d Update .gitlab-ci.yml 2019-07-31 00:29:45 +00:00
Daniel Løvbrøtte Olsen f307a8bde2 move 1ps to datapacks folder (woops) 2019-07-31 00:27:53 +00:00
Daniel Løvbrøtte Olsen 9b1dfaa3c4 Move datapacks into folder 2019-07-31 00:27:22 +00:00
Daniel Løvbrøtte Olsen 72dd744379 Update .gitlab-ci.yml 2019-07-20 14:31:05 +00:00
Daniel Løvbrøtte Olsen be671e61c5 Update .gitlab-ci.yml 2019-07-20 14:00:54 +00:00
Daniel Løvbrøtte Olsen 1a5ea3e4c5 Update .gitlab-ci.yml 2019-07-20 13:55:26 +00:00
Daniel Løvbrøtte Olsen c3b5d23af5 Update .gitlab-ci.yml 2019-07-20 13:51:32 +00:00
Daniel Løvbrøtte Olsen 71b088ee3e Update .gitlab-ci.yml 2019-07-20 13:45:21 +00:00
Daniel Løvbrøtte Olsen ab516d4613 Update .gitlab-ci.yml 2019-06-10 00:30:29 +00:00
Daniel Løvbrøtte Olsen 650f38e43c Update .gitlab-ci.yml 2019-06-08 00:30:55 +00:00
Daniel Løvbrøtte Olsen 8b68548e66 Update .gitlab-ci.yml 2019-06-08 00:29:09 +00:00
Daniel Løvbrøtte Olsen 5cb1bb27c0 Update .gitlab-ci.yml 2019-06-08 00:24:56 +00:00
Daniel Løvbrøtte Olsen 537b3cfdd7 Update .gitlab-ci.yml 2019-06-08 00:21:24 +00:00
Daniel Løvbrøtte Olsen 2e7f27a48d test 2019-06-07 23:28:09 +00:00
Daniel Løvbrøtte Olsen d5110026dc Merge branch 'MC-005' into 'master' 
Merges MC-005

Closes #5

See merge request Dandellion/minecraft-datapacks!1
 2019-05-24 11:35:03 +00:00
Daniel Løvbrøtte Olsen 7f20db0970 Update .gitlab-ci.yml 2019-05-24 11:10:53 +00:00
Daniel Løvbrøtte Olsen 1ce53443cb Merge branch 'master' into 'MC-005' 
Master to MC-005

See merge request Dandellion/minecraft-datapacks!3
 2019-05-24 00:21:19 +00:00
Daniel Løvbrøtte Olsen 82d704f331 Update .gitlab-ci.yml 2019-05-23 19:39:21 +00:00
Daniel Løvbrøtte Olsen d5f4b56d2a Update .gitlab-ci.yml 2019-05-23 19:36:04 +00:00
Daniel Løvbrøtte Olsen 74ba37796a Update .gitlab-ci.yml 2019-05-23 19:32:28 +00:00
Daniel Løvbrøtte Olsen d8fe8c3ea7 Update .gitlab-ci.yml 2019-05-23 19:29:22 +00:00
Daniel Løvbrøtte Olsen d1a01745bf Update .gitlab-ci.yml 2019-05-23 19:11:27 +00:00
Daniel Løvbrøtte Olsen 2dd48e0edb Update .gitlab-ci.yml 2019-05-23 19:09:04 +00:00
Daniel Løvbrøtte Olsen 3434140481 Update .gitlab-ci.yml 2019-05-23 19:06:57 +00:00
Daniel Løvbrøtte Olsen afb6705f5c Update .gitlab-ci.yml 2019-05-23 19:05:33 +00:00
Daniel Løvbrøtte Olsen 5cfe1b23f1 Update .gitlab-ci.yml 2019-05-23 19:03:09 +00:00
Daniel Løvbrøtte Olsen 4f08f8a340 Update .gitlab-ci.yml 2019-05-23 18:53:53 +00:00
Daniel Løvbrøtte Olsen 450552af18 Update .gitlab-ci.yml 2019-05-23 18:50:26 +00:00
Daniel Løvbrøtte Olsen 64e01c0827 Update .gitlab-ci.yml 2019-05-23 18:38:04 +00:00
Daniel Løvbrøtte Olsen 774e8e9681 Update .gitlab-ci.yml 2019-05-23 18:36:46 +00:00
Daniel Løvbrøtte Olsen 11335d0955 Update .gitlab-ci.yml 2019-05-23 18:10:27 +00:00
Daniel Løvbrøtte Olsen 503e5819ed Update .gitlab-ci.yml 2019-05-23 18:09:44 +00:00
Daniel Løvbrøtte Olsen 282579e372 Update .gitlab-ci.yml 2019-05-23 18:08:47 +00:00
Daniel Løvbrøtte Olsen 74daed8197 remove custom wool tag 
Was this added to vanilla in 1.13?
 2019-05-23 09:20:51 +00:00
Daniel Løvbrøtte Olsen a97ef160a1 Update README.md 2019-05-22 10:12:04 +00:00
Daniel Løvbrøtte Olsen f767a49977 Update .gitlab-ci.yml 2019-05-22 01:51:00 +00:00
Daniel Løvbrøtte Olsen 3f0e136b94 Update .gitlab-ci.yml 2019-05-22 01:49:39 +00:00
Daniel Løvbrøtte Olsen b2ba9157b2 Update .gitlab-ci.yml 2019-05-22 01:47:36 +00:00
Daniel Løvbrøtte Olsen 35ae220f5e Update .gitlab-ci.yml 2019-05-22 01:26:47 +00:00
Daniel Løvbrøtte Olsen 30dcfd112e Update .gitlab-ci.yml 2019-05-22 01:22:14 +00:00
Daniel Løvbrøtte Olsen 2fdec1a547 Update .gitlab-ci.yml 2019-05-22 01:20:29 +00:00
Daniel Løvbrøtte Olsen e56b81de98 Update .gitlab-ci.yml 2019-05-22 01:19:40 +00:00
Daniel Løvbrøtte Olsen 334d25619c Update .gitlab-ci.yml 2019-05-22 01:17:45 +00:00
Daniel Løvbrøtte Olsen 9259934e62 Update README.md 2019-05-22 01:12:26 +00:00
Daniel Løvbrøtte Olsen 277ae83826 Deleted MC-001_disable_vanilla/data/minecraft/recipes/stone_slab.json, MC-001_disable_vanilla/pack.mcmeta files 2019-05-22 01:06:22 +00:00
Daniel Løvbrøtte Olsen 9d60a2d197 Deleted dodsorfas_easy_crafting/data/dodsorfas_easy_crafting/recipes/trapped_chest_easy2.json 2019-05-22 01:01:02 +00:00
Daniel Løvbrøtte Olsen 0f34ae27f0 Update .gitlab-ci.yml 2019-05-22 00:23:42 +00:00
Daniel Løvbrøtte Olsen 36f3ae88d1 Update .gitlab-ci.yml 2019-05-22 00:23:01 +00:00
Daniel Løvbrøtte Olsen 63de4cd8ef Update .gitlab-ci.yml 2019-05-22 00:21:13 +00:00
Daniel Løvbrøtte Olsen d5220d1d12 Update .gitlab-ci.yml 2019-05-22 00:20:17 +00:00
Daniel Løvbrøtte Olsen bd7c40cc2e Update .gitlab-ci.yml 2019-05-22 00:18:12 +00:00
Daniel Løvbrøtte Olsen d36edb474f Update .gitlab-ci.yml 2019-05-22 00:16:30 +00:00
Daniel Løvbrøtte Olsen 0baa80563d Update .gitlab-ci.yml 2019-05-22 00:14:41 +00:00
Daniel Løvbrøtte Olsen 7767ff632c Update .gitlab-ci.yml 2019-05-22 00:02:38 +00:00
Daniel Løvbrøtte Olsen 98b3e210c5 Update .gitlab-ci.yml 2019-05-22 00:02:24 +00:00
Daniel Løvbrøtte Olsen 60b1a193c8 Update .gitlab-ci.yml 2019-05-21 23:56:15 +00:00
Daniel Løvbrøtte Olsen 9e3a535859 Add .gitlab-ci.yml 2019-05-21 23:24:57 +00:00
Daniel Løvbrøtte Olsen be64db3e65 Initial commit 2019-05-21 11:37:20 +00:00