Commit Graph

  • c1ff05cf79 Merge branch 'MC-003B' into 'master' Daniel Løvbrøtte Olsen 2020-03-21 06:02:14 +0000
  • b1bbea8ba3 Merge branch 'MC-002' into 'master' Daniel Løvbrøtte Olsen 2020-03-20 18:40:38 +0000
  • e5e96a43a2 Merge branch 'MC-025' into 'master' master Daniel Løvbrøtte Olsen 2020-03-19 14:59:47 +0000
  • a8bfeda4bd customize armor stands MC-025 Daniel Løvbrøtte Olsen 2020-03-19 15:59:23 +0100
  • 53d88fc3be Merge branch 'MC-024' into 'master' Daniel Løvbrøtte Olsen 2020-03-16 12:16:08 +0000
  • 1c9dbedfb8 add wandering_trader MC-024 Daniel Løvbrøtte Olsen 2020-03-14 23:56:26 +0100
  • 3bd459326e zip is being a dumb dumb Daniel Løvbrøtte Olsen 2020-02-24 08:39:20 +0000
  • 5b9b55085c rename to lower case Daniel Løvbrøtte Olsen 2020-02-24 08:36:47 +0000
  • ef7749c7f1 Merge branch 'MC-012A' into 'master' Daniel Løvbrøtte Olsen 2020-02-24 08:29:50 +0000
  • 4b73c48cd2 Add voodo's bat membrane datapack MC-012A Daniel Løvbrøtte Olsen 2020-02-24 08:28:30 +0000
  • d8e6b96440 delete unused plugins Daniel Løvbrøtte Olsen 2020-02-24 01:31:29 +0000
  • 0a90343dd0 Merge branch '1.15' into 'master' Daniel Løvbrøtte Olsen 2020-02-24 00:28:39 +0000
  • 5374edaaf9 Update Vanilla Tweaks to 1.15 1.15 Daniel Løvbrøtte Olsen 2019-12-19 11:03:40 +0100
  • 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 Daniel Løvbrøtte Olsen 2019-11-15 14:19:51 +0000
  • 71bde517f2 Update dansbrain.json Daniel Løvbrøtte Olsen 2019-10-18 09:17:07 +0000
  • 9a4d9087d7 Update adv5.json -> brain Daniel Løvbrøtte Olsen 2019-10-18 09:14:16 +0000
  • 6491a97b04 Update adv5.json Daniel Løvbrøtte Olsen 2019-10-18 09:01:46 +0000
  • 4b4f06d12b add initial advancement pack Daniel Løvbrøtte Olsen 2019-10-18 01:20:35 +0200
  • 2ac362c48e rename enchantmerger Daniel Løvbrøtte Olsen 2019-09-13 18:04:49 +0200
  • a72c37a555 Merge branch 'master' of https://git.dodsorf.as/dodsorfas/minecraft-datapacks Daniel Løvbrøtte Olsen 2019-09-13 17:59:35 +0200
  • ec790031a0 for 28 days we will allow making god armor Daniel Løvbrøtte Olsen 2019-09-13 17:59:17 +0200
  • e9a32813c2 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-09-13 15:38:22 +0000
  • 88fc2fb988 Merge branch '1.14' into 'master' Daniel Løvbrøtte Olsen 2019-09-13 15:33:50 +0000
  • 02bea5712b fix light variation in gray and blue dodsorfas recolor 1.14 Daniel Løvbrøtte Olsen 2019-09-13 17:33:04 +0200
  • e0e6ec8f94 fix dodsorfas color with new dye names Daniel Løvbrøtte Olsen 2019-09-13 17:30:15 +0200
  • e3b1811c0f Merge branch '1.14' into 'master' Daniel Løvbrøtte Olsen 2019-09-13 15:17:39 +0000
  • 1708bd1ae5 Upgrade 1ps Daniel Løvbrøtte Olsen 2019-09-13 17:17:05 +0200
  • 48cff062ce Update Resourcepack to 1.14 - remove 1.14 ported textures Daniel Løvbrøtte Olsen 2019-09-12 17:52:30 +0200
  • 21bf14f4d3 remove 1.14 recipes from old_blocks :D Daniel Løvbrøtte Olsen 2019-09-12 16:49:51 +0200
  • 46ebec8655 fix black_wool_improved.json Daniel Løvbrøtte Olsen 2019-09-11 12:17:32 +0000
  • 7d9624cfac Add Minetrix bridge to replace dodsorbot Daniel Løvbrøtte Olsen 2019-09-11 10:57:26 +0000
  • 477c02b778 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-08-26 09:58:18 +0000
  • fde4132c56 Acyclic Graphs Daniel Løvbrøtte Olsen 2019-08-26 09:13:57 +0000
  • c67936c9ba Merge branch 'MC-011' into 'master' Daniel Løvbrøtte Olsen 2019-08-18 02:30:46 +0000
  • 974c8ee1b3 Update .gitlab-ci.yml (pages) Daniel Løvbrøtte Olsen 2019-08-18 02:29:47 +0000
  • 4dfbd87f2d 1.14 beta textures 3.3 Daniel Løvbrøtte Olsen 2019-08-18 03:31:46 +0200
  • 4065f1790a Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-08-15 18:43:34 +0000
  • dfb7688b07 Merge branch 'MC-010' into 'master' Daniel Løvbrøtte Olsen 2019-08-15 14:43:28 +0000
  • e48b106859 Transparent pumpkin overlay Daniel Løvbrøtte Olsen 2019-08-15 16:40:16 +0200
  • bc6ee171ff Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-08-08 06:59:34 +0000
  • 46933bb4b7 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-08-08 06:56:43 +0000
  • 7df7b4567e Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-08-08 06:51:23 +0000
  • 5eb52e121e Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-08-08 06:42:43 +0000
  • 28c4fb165b Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-08-08 06:36:26 +0000
  • 7ae9cc7e7f Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-08-08 06:31:16 +0000
  • 80e426910d Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-08-08 06:29:16 +0000
  • bcd0e6cf7a Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-08-08 06:26:34 +0000
  • 3c9238ff74 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-08-08 06:22:41 +0000
  • b25706e576 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-08-08 06:16:51 +0000
  • 635aa4bb11 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-08-08 06:00:23 +0000
  • c0513b7f53 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-08-08 05:50:09 +0000
  • 67dcec4ae0 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-08-08 05:46:45 +0000
  • bf0f0c309f Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-08-08 05:24:52 +0000
  • a70bbbc77e Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-08-08 05:06:42 +0000
  • 17e79f9a3d Incorporate plugins and config Daniel Løvbrøtte Olsen 2019-08-08 05:05:31 +0000
  • a4518a93b5 Merge branch 'MC-007' into 'master' Daniel Løvbrøtte Olsen 2019-08-01 00:35:45 +0000
  • a9affd2a4c Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-07-31 10:08:01 +0000
  • e9b85171b2 quartz not nether_quartz Daniel Løvbrøtte Olsen 2019-07-31 11:55:37 +0200
  • 9f7a935160 add uncrafting quartz and nether wart Daniel Løvbrøtte Olsen 2019-07-31 04:11:47 +0200
  • ec5e556897 add initial datapack Daniel Løvbrøtte Olsen 2019-07-31 02:53:23 +0200
  • 46da75f811 add initial datapack Daniel Løvbrøtte Olsen 2019-07-31 02:51:45 +0200
  • 073bb8ea6d Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-07-31 00:29:45 +0000
  • f307a8bde2 move 1ps to datapacks folder (woops) Daniel Løvbrøtte Olsen 2019-07-31 00:27:53 +0000
  • 9b1dfaa3c4 Move datapacks into folder Daniel Løvbrøtte Olsen 2019-07-31 00:27:22 +0000
  • 72dd744379 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-07-20 14:31:05 +0000
  • be671e61c5 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-07-20 14:00:54 +0000
  • 1a5ea3e4c5 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-07-20 13:55:26 +0000
  • c3b5d23af5 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-07-20 13:51:32 +0000
  • 71b088ee3e Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-07-20 13:45:21 +0000
  • ab516d4613 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-06-10 00:30:29 +0000
  • 650f38e43c Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-06-08 00:30:55 +0000
  • 8b68548e66 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-06-08 00:29:09 +0000
  • 5cb1bb27c0 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-06-08 00:24:56 +0000
  • 537b3cfdd7 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-06-08 00:21:24 +0000
  • 2e7f27a48d test Daniel Løvbrøtte Olsen 2019-06-07 23:28:09 +0000
  • d5110026dc Merge branch 'MC-005' into 'master' Daniel Løvbrøtte Olsen 2019-05-24 11:35:03 +0000
  • 7f20db0970 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-05-24 11:10:53 +0000
  • 2730638b5e oops MC-003B Daniel Løvbrøtte Olsen 2019-05-24 12:20:02 +0200
  • e997a0a3a6 MC-003B Daniel Løvbrøtte Olsen 2019-05-24 12:14:15 +0200
  • 1a316ab9fc prepare Daniel Løvbrøtte Olsen 2019-05-24 12:08:06 +0200
  • e8622b618f remove dispenser recipe Daniel Løvbrøtte Olsen 2019-05-24 02:22:42 +0200
  • 1ce53443cb Merge branch 'master' into 'MC-005' Daniel Løvbrøtte Olsen 2019-05-24 00:21:19 +0000
  • 82d704f331 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-05-23 19:39:21 +0000
  • d5f4b56d2a Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-05-23 19:36:04 +0000
  • 74ba37796a Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-05-23 19:32:28 +0000
  • d8fe8c3ea7 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-05-23 19:29:22 +0000
  • d1a01745bf Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-05-23 19:11:27 +0000
  • 2dd48e0edb Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-05-23 19:09:04 +0000
  • 3434140481 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-05-23 19:06:57 +0000
  • afb6705f5c Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-05-23 19:05:33 +0000
  • 5cfe1b23f1 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-05-23 19:03:09 +0000
  • 4f08f8a340 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-05-23 18:53:53 +0000
  • 450552af18 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-05-23 18:50:26 +0000
  • 64e01c0827 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-05-23 18:38:04 +0000
  • 774e8e9681 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-05-23 18:36:46 +0000
  • 11335d0955 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-05-23 18:10:27 +0000
  • 503e5819ed Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-05-23 18:09:44 +0000
  • 282579e372 Update .gitlab-ci.yml Daniel Løvbrøtte Olsen 2019-05-23 18:08:47 +0000
  • 74daed8197 remove custom wool tag Daniel Løvbrøtte Olsen 2019-05-23 09:20:51 +0000
  • 1c7c00b3fd Update ender_dragon.json MC-002 Daniel Løvbrøtte Olsen 2019-05-22 23:26:43 +0000