Commit Graph

109 Commits

Author SHA1 Message Date
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 4b4f06d12b add initial advancement pack 2019-10-18 01:20:35 +02:00
Daniel Løvbrøtte Olsen 2ac362c48e rename enchantmerger 2019-09-13 18:04:49 +02:00
Daniel Løvbrøtte Olsen a72c37a555 Merge branch 'master' of https://git.dodsorf.as/dodsorfas/minecraft-datapacks 2019-09-13 17:59:35 +02:00
Daniel Løvbrøtte Olsen ec790031a0 for 28 days we will allow making god armor 2019-09-13 17:59:17 +02: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 02bea5712b fix light variation in gray and blue dodsorfas recolor 2019-09-13 17:33:04 +02:00
Daniel Løvbrøtte Olsen e0e6ec8f94 fix dodsorfas color with new dye names 2019-09-13 17:30:15 +02: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 1708bd1ae5 Upgrade 1ps 2019-09-13 17:17:05 +02:00
Daniel Løvbrøtte Olsen 48cff062ce Update Resourcepack to 1.14 - remove 1.14 ported textures 2019-09-12 17:52:30 +02:00
Daniel Løvbrøtte Olsen 21bf14f4d3 remove 1.14 recipes from old_blocks :D 2019-09-12 16:49:51 +02: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 4dfbd87f2d 1.14 beta textures 3.3 2019-08-18 03:31:46 +02: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 e48b106859 Transparent pumpkin overlay 2019-08-15 16:40:16 +02: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 e9b85171b2 quartz not nether_quartz 2019-07-31 11:55:37 +02:00
Daniel Løvbrøtte Olsen 9f7a935160 add uncrafting quartz and nether wart 2019-07-31 04:11:47 +02:00
Daniel Løvbrøtte Olsen ec5e556897 add initial datapack 2019-07-31 02:53:23 +02:00
Daniel Løvbrøtte Olsen 46da75f811 add initial datapack 2019-07-31 02:51:45 +02: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