Commit Graph

  • dbaafecf28 Merge branch 'dependabot/submodules/bonemeal-4c50a02' into 'master' Milan 2022-03-24 16:38:14 +0100
  • 3678f414c5 Merge branch 'dependabot/submodules/plantlife_modpack-1d71e2c' into 'master' Milan 2022-03-24 16:38:07 +0100
  • 7b5aaec211 Merge branch 'master' into 'awards' Dirk 2022-03-22 23:11:42 +0100
  • 14700ef498 Merge branch 'master' into 'master' Dirk 2022-03-22 23:09:35 +0100
  • 4bf7b7dfa3 add first awards for testing Dirkfried 2022-03-22 22:24:11 +0100
  • ae4ebf9f0c Bump plantlife_modpack from `d3edfbe` to `1d71e2c` Dependabot 2022-03-20 08:04:53 +0100
  • d83d4fd86f Bump bonemeal from `79f9cb3` to `4c50a02` Dependabot 2022-03-20 08:04:46 +0100
  • 3d182d3e97 Bump farming from `2e90959` to `0b06c7c` Dependabot 2022-03-20 08:04:36 +0100
  • 9e6d3c399c Merge branch 'dependabot/submodules/charcoal-5f70976' into 'master' Milan 2022-03-14 22:24:18 +0100
  • 5ff3785022 Merge branch 'dependabot/submodules/3d_armor-a9b8bc4' into 'master' Milan 2022-03-14 22:24:09 +0100
  • 5548771b91 Merge branch 'dependabot/submodules/nether-d3f79e9' into 'master' Milan 2022-03-14 22:23:37 +0100
  • 085791535f Merge branch 'dependabot/submodules/wardrobe-369c088' into 'master' Milan 2022-03-14 22:23:29 +0100
  • 6beafd1369 Merge branch 'dependabot/submodules/wine-82746a5' into 'master' Milan 2022-03-14 22:22:37 +0100
  • f65d082442 Merge branch 'dependabot/submodules/unifieddyes-41dd54d' into 'master' Milan 2022-03-14 22:21:33 +0100
  • 5fc9fbcebb Merge branch 'dependabot/submodules/protector-939f65d' into 'master' Milan 2022-03-14 22:21:00 +0100
  • 60f5ac04cf Merge branch 'dependabot/submodules/player_monoids-08bc018' into 'master' Milan 2022-03-14 22:20:48 +0100
  • b77646fd23 Merge branch 'dependabot/submodules/basic_materials-8631a26' into 'master' Milan 2022-03-14 22:20:28 +0100
  • 165835cabb Merge branch 'dependabot/submodules/mesecons-399ee9f' into 'master' Milan 2022-03-14 22:20:19 +0100
  • a200596d11 Merge branch 'dependabot/submodules/farming-2e90959' into 'master' Milan 2022-03-14 22:20:10 +0100
  • 9dd690bba5 Merge branch 'dependabot/submodules/spectator_mode-1b031eb' into 'master' Milan 2022-03-14 22:19:59 +0100
  • fb14d2ffbd Merge branch 'dependabot/submodules/i3-1dd742e' into 'master' Milan 2022-03-14 22:19:35 +0100
  • faed691cd8 Merge branch 'dependabot/submodules/signs_lib-14efa6e' into 'master' Milan 2022-03-14 22:18:09 +0100
  • 9242c6a149 Merge branch 'dependabot/submodules/skinsdb-c9fa5d9' into 'master' Milan 2022-03-14 22:11:04 +0100
  • a173d87f15 Update .luacheckrc Milan 2022-03-14 22:00:36 +0100
  • faac48fc37 Update .luacheckrc (oops) Milan 2022-03-14 21:59:38 +0100
  • 5db31aceee Update .luacheckrc Milan 2022-03-14 21:57:40 +0100
  • 5eef41c403 Merge branch 'nether' into 'master' Milan 2022-03-14 21:50:03 +0100
  • a2f2545c62 Bump skinsdb from `716a9a3` to `c9fa5d9` Dependabot 2022-03-13 08:05:23 +0100
  • 04dadb1ad4 Bump signs_lib from `aa5f865` to `14efa6e` Dependabot 2022-03-13 08:05:17 +0100
  • 805dc690d2 Bump i3 from `e3941a7` to `1dd742e` Dependabot 2022-03-13 08:05:11 +0100
  • c204b58b11 Bump spectator_mode from `3648371` to `1b031eb` Dependabot 2022-03-13 08:04:54 +0100
  • 630bf503a9 Bump farming from `d59e200` to `2e90959` Dependabot 2022-03-13 08:04:41 +0100
  • d913838e1a Bump mesecons from `4c5b13a` to `399ee9f` Dependabot 2022-03-13 08:04:37 +0100
  • 7adb0a8592 Bump basic_materials from `d9e0698` to `8631a26` Dependabot 2022-03-06 08:04:24 +0100
  • 27bcf2269e Bump player_monoids from `ed11a73` to `08bc018` Dependabot 2022-03-06 08:04:13 +0100
  • 15dc0f2414 Bump protector from `df56135` to `939f65d` Dependabot 2022-03-06 08:04:05 +0100
  • faede8d2ba Bump unifieddyes from `ff3b2d3` to `41dd54d` Dependabot 2022-02-27 08:04:53 +0100
  • f17515aeb0 Bump wine from `ae058f9` to `82746a5` Dependabot 2022-02-13 08:04:24 +0100
  • 89ee79cf87 Bump wardrobe from `8636079` to `369c088` Dependabot 2022-02-13 08:04:22 +0100
  • 4d6187827c Bump nether from `d8e6a6a` to `d3f79e9` Dependabot 2022-02-13 08:04:20 +0100
  • cf5130a788 Bump 3d_armor from `b6651fd` to `a9b8bc4` Dependabot 2022-02-06 08:04:23 +0100
  • 8c7b732dcc Bump charcoal from `ac7e03b` to `5f70976` Dependabot 2022-02-06 08:04:17 +0100
  • 113a899ee8 correct armor_use (it works inverse) Dirkfried 2022-02-05 10:34:05 +0100
  • 4e767ee9cd Nether tool changes as overrides and change uses Dirkfried 2022-02-04 15:49:40 +0100
  • 9518e76900 adjust armors and include Nether armor Dirkfried 2022-02-04 15:29:34 +0100
  • 022bab6b8f Merge branch 'master' into 'master' Dirk 2022-02-04 12:49:06 +0100
  • 36b1efd813 add submodule awards + skinsdb Milan 2022-02-01 12:01:09 +0100
  • 54fd770e91 Merge branch 'dependabot/submodules/charcoal-ac7e03b' into 'master' Milan 2022-01-31 20:48:40 +0100
  • a8ddff52e7 Merge branch 'dependabot/submodules/bonemeal-79f9cb3' into 'master' Milan 2022-01-31 20:48:31 +0100
  • 57dd9c667f Merge branch 'dependabot/submodules/plantlife_modpack-d3edfbe' into 'master' Milan 2022-01-31 20:47:46 +0100
  • 205ab149c0 Merge branch 'dependabot/submodules/i3-e3941a7' into 'master' Milan 2022-01-31 20:46:11 +0100
  • 41e35f5cf7 Merge branch 'dependabot/submodules/biome_lib-396ca88' into 'master' Milan 2022-01-31 20:45:38 +0100
  • 801005a57c Merge branch 'dependabot/submodules/mesecons-4c5b13a' into 'master' Milan 2022-01-31 20:45:23 +0100
  • 11bf9af237 Merge branch 'dependabot/submodules/farming-d59e200' into 'master' Milan 2022-01-31 20:45:07 +0100
  • 732cba2d30 Merge branch 'dependabot/submodules/mapserver_mod-b4ffb0a' into 'master' Milan 2022-01-31 20:44:51 +0100
  • 8cca9e663e Merge branch 'dependabot/submodules/basic_materials-d9e0698' into 'master' Milan 2022-01-31 20:44:29 +0100
  • 16a0d55421 Bump basic_materials from `0893974` to `d9e0698` Dependabot 2022-01-30 08:03:50 +0100
  • 3804e8814e Bump mapserver_mod from `ad4e151` to `b4ffb0a` Dependabot 2022-01-30 08:03:41 +0100
  • 4ea97b042b Bump farming from `211cedc` to `d59e200` Dependabot 2022-01-30 08:03:31 +0100
  • e8c35c6804 Bump mesecons from `ecea0a2` to `4c5b13a` Dependabot 2022-01-30 08:03:29 +0100
  • 12f6219652 Bump biome_lib from `932485a` to `396ca88` Dependabot 2022-01-23 08:04:16 +0100
  • e1c9d11f3b Bump i3 from `b4d7dfd` to `e3941a7` Dependabot 2022-01-23 08:04:13 +0100
  • be645fa437 Bump plantlife_modpack from `7094d8a` to `d3edfbe` Dependabot 2022-01-16 08:04:15 +0100
  • 6f432b1f90 Bump bonemeal from `2d7dbc7` to `79f9cb3` Dependabot 2022-01-16 08:04:04 +0100
  • c78fffec2c Bump charcoal from `fcc2e01` to `ac7e03b` Dependabot 2022-01-16 08:04:01 +0100
  • b4a26ed587 Merge branch 'dependabot/submodules/mobs_monster-781ac19' into 'master' Milan 2022-01-06 16:32:42 +0100
  • a3c89afdd1 Merge branch 'dependabot/submodules/farming-211cedc' into 'master' Milan 2022-01-06 16:32:34 +0100
  • f9f62efb49 Merge branch 'dependabot/submodules/protector-df56135' into 'master' Milan 2022-01-06 16:32:25 +0100
  • 91309ab3f3 Merge branch 'dependabot/submodules/charcoal-fcc2e01' into 'master' Milan 2022-01-06 16:32:17 +0100
  • 556ba34212 Merge branch 'dependabot/submodules/maptools-f3464f5' into 'master' Milan 2022-01-06 16:32:07 +0100
  • 8517dfeace Merge branch 'dependabot/submodules/biome_lib-932485a' into 'master' Milan 2022-01-06 16:31:56 +0100
  • 94602723d5 Merge branch 'dependabot/submodules/plantlife_modpack-7094d8a' into 'master' Milan 2022-01-06 16:31:47 +0100
  • 6865c63734 Merge branch 'dependabot/submodules/signs_lib-aa5f865' into 'master' Milan 2022-01-06 16:31:35 +0100
  • 51147d8cd6 Bump signs_lib from `1327cb2` to `aa5f865` Dependabot 2022-01-06 15:51:05 +0100
  • d2cf5b2563 Bump plantlife_modpack from `680b02f` to `7094d8a` Dependabot 2022-01-06 15:51:01 +0100
  • a33d732043 Bump biome_lib from `4e3493a` to `932485a` Dependabot 2022-01-06 15:50:58 +0100
  • 1f77320a58 Bump maptools from `d1134c4` to `f3464f5` Dependabot 2022-01-06 15:50:46 +0100
  • 96def988e8 Bump charcoal from `c394c7d` to `fcc2e01` Dependabot 2022-01-06 15:50:42 +0100
  • 53ca4fbcbc Bump protector from `7a3c173` to `df56135` Dependabot 2022-01-06 15:50:39 +0100
  • e5d6462cef Bump farming from `273ce33` to `211cedc` Dependabot 2022-01-06 15:50:34 +0100
  • d76628f43a Bump mobs_monster from `a96c702` to `781ac19` Dependabot 2022-01-06 15:50:32 +0100
  • 71b17c575b Merge branch 'dependabot/submodules/nether-d8e6a6a' into 'master' Milan 2022-01-06 15:29:06 +0100
  • d9434e5601 Merge branch 'dependabot/submodules/mesecons-ecea0a2' into 'master' Milan 2022-01-06 15:28:56 +0100
  • ae54e288e5 Merge branch 'dependabot/submodules/farming-273ce33' into 'master' Milan 2022-01-06 15:28:46 +0100
  • 6544d9af65 update submodule playerskins Milan 2022-01-04 12:32:35 +0100
  • 66a78a77f9 update submodule moreores Milan 2022-01-04 12:23:02 +0100
  • da6bc7c3aa Bump farming from `4227d96` to `273ce33` Milan 2021-12-05 08:03:43 +0100
  • 6bd818542f Bump nether from `247ca08` to `d8e6a6a` Milan 2021-12-05 08:03:41 +0100
  • e1f71340f3 Bump mesecons from `9323445` to `ecea0a2` Milan 2021-12-05 08:03:38 +0100
  • 5672505e12 update replacer_admin definition Milan 2021-11-28 19:22:38 +0100
  • feb1835678 replace VanessaE mods Milan 2021-11-28 17:24:44 +0100
  • d2de7ca125 Merge branch 'dependabot/submodules/moreblocks-dce587c' into 'master' Milan 2021-11-21 11:25:30 +0100
  • 5255dd201c Merge branch 'dependabot/submodules/3d_armor-b6651fd' into 'master' Milan 2021-11-21 11:24:30 +0100
  • f20c0df188 Merge branch 'dependabot/submodules/farming-4227d96' into 'master' Milan 2021-11-21 11:22:42 +0100
  • 734b8c82aa Merge branch 'dependabot/submodules/worldedit-c223ca4' into 'master' Milan 2021-11-21 11:22:23 +0100
  • 7b5ac87153 Merge branch 'dependabot/submodules/i3-b4d7dfd' into 'master' Milan 2021-11-21 11:22:06 +0100
  • 5c4e190eac Bump i3 from `09cb35e` to `b4d7dfd` Milan 2021-11-21 08:04:25 +0100
  • 04a2d7ab8a Bump worldedit from `c8afa95` to `c223ca4` Milan 2021-11-21 08:04:12 +0100
  • e4197da7ba Bump farming from `f8533c4` to `4227d96` Milan 2021-11-21 08:04:07 +0100
  • bcf6c5ac92 Bump 3d_armor from `8dcbc42` to `b6651fd` Milan 2021-11-14 08:04:11 +0100