Code

0.5.15#3414

Code

Merged

NielsPilgaard merged 172 commits intomasterEnigmaticaModpacks/Enigmatica6:masterfrom developEnigmaticaModpacks/Enigmatica6:developCopy head branch name to clipboardOct 11, 2021

+24,770-20,872

Commits

Commits on Aug 12, 2021

• Merge pull request #51 from NillerMedDild/develop

  Show description for a2beae4
  Ridanisaurus

  authored
  a2beae4

  Copy full SHA for a2beae4

Commits on Aug 19, 2021

• Merge pull request #52 from NillerMedDild/develop

  Show description for f99b5b5
  Ridanisaurus

  authored
  f99b5b5

  Copy full SHA for f99b5b5

Commits on Sep 4, 2021

• Merge pull request #53 from NillerMedDild/develop

  Show description for 539508f
  Ridanisaurus

  authored
  539508f

  Copy full SHA for 539508f

Commits on Sep 23, 2021

• Thermal Augments

  Show description for e445ed9
  MuteTiefling

  committed
  e445ed9

  Copy full SHA for e445ed9

• Update replace_output.js

  MuteTiefling

  committed
  642295c

  Copy full SHA for 642295c

Commits on Sep 24, 2021

• attempt at multiple items

  MuteTiefling

  committed
  b91dc95

  Copy full SHA for b91dc95

• Revert "attempt at multiple items"

  Show description for d2af192
  MuteTiefling

  committed
  d2af192

  Copy full SHA for d2af192

• take two without the extras...

  MuteTiefling

  committed
  d5de36f

  Copy full SHA for d5de36f

Commits on Sep 25, 2021

• Merge remote-tracking branch 'upstream/develop' into thermal-power-upgrade

  MuteTiefling

  committed
  3a3ecd3

  Copy full SHA for 3a3ecd3

• Update jei_add_items.js

  MuteTiefling

  committed
  b86fd05

  Copy full SHA for b86fd05

Commits on Sep 26, 2021

• Merge branch 'develop' into thermal-power-upgrade

  MuteTiefling

  committed
  236943f

  Copy full SHA for 236943f

• Update to assets in case that's somehow interfering with JEI

  MuteTiefling

  committed
  8c0edef

  Copy full SHA for 8c0edef

• Attempt to hide originals...

  MuteTiefling

  committed
  61eaf0c

  Copy full SHA for 61eaf0c

• auto formatting

  NielsPilgaard

  committed
  dd11e7a

  Copy full SHA for dd11e7a

• removed tags from client scripts

  NielsPilgaard

  committed
  007c05b

  Copy full SHA for 007c05b

• synced disabled item lists

  NielsPilgaard

  committed
  7221f95

  Copy full SHA for 7221f95

• cleanup regex hide / item hide

  NielsPilgaard

  committed
  ebee527

  Copy full SHA for ebee527

• auto format

  NielsPilgaard

  committed
  544c272

  Copy full SHA for 544c272

• move array to file itself, as it's only used once

  NielsPilgaard

  committed
  21205bb

  Copy full SHA for 21205bb

• Merge branch 'develop' into thermal-power-upgrade

  MuteTiefling

  committed
  cbb33fb

  Copy full SHA for cbb33fb

• fix broken loot table entry, fix errors in apoth gear scripts, add tag to dimensional matrix for easier auto crafting

  MuteTiefling

  committed
  06c71cd

  Copy full SHA for 06c71cd

• fixed typos in apotheosis scripts

  NielsPilgaard

  committed
  6c6ec4a

  Copy full SHA for 6c6ec4a

• replaced integrated circuit with precision mekanism in dungeon_clockwork_rare loot table

  NielsPilgaard

  committed
  feccdc0

  Copy full SHA for feccdc0

• I had typos in my typo corrections 😅

  NielsPilgaard

  committed
  3ddd12c

  Copy full SHA for 3ddd12c

• added default c&b client config to disable bits in jei

  NielsPilgaard

  committed
  d5dd830

  Copy full SHA for d5dd830

• removed default c&b config again, force hidden bits from jei

  NielsPilgaard

  committed
  591b64e

  Copy full SHA for 591b64e

• fixed aurora crystal not being crushable by occultism

  NielsPilgaard

  committed
  e22b1e2

  Copy full SHA for e22b1e2

• updated animal spawner scripts to more recent standards

  NielsPilgaard

  committed
  9f602d4

  Copy full SHA for 9f602d4

• unborked animal spawner scripts

  NielsPilgaard

  committed
  141a339

  Copy full SHA for 141a339

• Add Botana Earth/Fire runes as machine catalysts

  MuteTiefling

  committed
  b86e90d

  Copy full SHA for b86e90d

Commits on Sep 27, 2021

• Update item_registry.js

  MuteTiefling

  committed
  bc233ac

  Copy full SHA for bc233ac

• Update item_registry.js

  MuteTiefling

  committed
  2d943b0

  Copy full SHA for 2d943b0

• Update jei_add_items.js

  MuteTiefling

  committed
  7b1009b

  Copy full SHA for 7b1009b

• more fixes

  MuteTiefling

  committed
  bb8bdc7

  Copy full SHA for bb8bdc7

• Fix broken Apoth entries, remove missing item from loot tables, remove extra Expert amadron recipe, add dimensional matrix tag to simplifiy autocrafting

  Show description for 6fc81a1
  MuteTiefling

  committed
  6fc81a1

  Copy full SHA for 6fc81a1

• Merge branch 'develop' into fixes

  MuteTiefling

  authored
  3e395f6

  Copy full SHA for 3e395f6

• Merge pull request #3324 from MuteTiefling/fixes

  Show description for d41ddaf
  MuteTiefling

  authored
  d41ddaf

  Copy full SHA for d41ddaf

• Merge branch 'develop' into thermal-power-upgrade

  MuteTiefling

  committed
  f710ff6

  Copy full SHA for f710ff6

• Change Artifact Infinity Tools to accept Weak NBT instead of Strong

  Show description for df3749f
  MuteTiefling

  committed
  df3749f

  Copy full SHA for df3749f

• Update challenges.snbt

  MuteTiefling

  committed
  792119c

  Copy full SHA for 792119c

• Merge pull request #3327 from MuteTiefling/develop

  Show description for 14796b5
  MuteTiefling

  authored
  14796b5

  Copy full SHA for 14796b5

Commits on Sep 28, 2021

• [Expert] Occultism and Ars Nouveau tweaks

  Show description for 111ac0a
  MuteTiefling

  committed
  111ac0a

  Copy full SHA for 111ac0a

• Merge pull request #3328 from MuteTiefling/Occultism-update

  Show description for 01db39d
  NielsPilgaard

  authored
  01db39d

  Copy full SHA for 01db39d

• fixed wirecutter only working when at full durability, fixes #3329

  NielsPilgaard

  committed
  f2f93b0

  Copy full SHA for f2f93b0

• Merge branch 'develop' of https://github.com/NillerMedDild/Enigmatica6 into develop

  NielsPilgaard

  committed
  052a58a

  Copy full SHA for 052a58a

• Update CHANGELOG.md

  NielsPilgaard

  committed
  d69a1f2

  Copy full SHA for d69a1f2

• Hide disabled trinkets

  Show description for 192b893
  MuteTiefling

  committed
  192b893

  Copy full SHA for 192b893

• Merge pull request #3332 from MuteTiefling/develop

  Show description for c5be8e4
  MuteTiefling

  authored
  c5be8e4

  Copy full SHA for c5be8e4

• added iChisel to quark ignored screens list, fixes #3330

  NielsPilgaard

  committed
  f2f690d

  Copy full SHA for f2f690d

• mod updates

  NielsPilgaard

  committed
  e64ef8b

  Copy full SHA for e64ef8b

• Merge branch 'develop' of https://github.com/NillerMedDild/Enigmatica6 into develop

  NielsPilgaard

  committed
  d7e91cd

  Copy full SHA for d7e91cd

Commits on Sep 29, 2021

• [Expert] Blood Magic Updates

  Show description for b69e24c
  MuteTiefling

  committed
  b69e24c

  Copy full SHA for b69e24c

• Update shaped.js

  MuteTiefling

  committed
  8093a00

  Copy full SHA for 8093a00

• more stuffs

  MuteTiefling

  committed
  3dfb644

  Copy full SHA for 3dfb644

• Make Morph o Tool work with Compact Machine Shrink Device

  Show description for 4aa50d5
  MuteTiefling

  committed
  4aa50d5

  Copy full SHA for 4aa50d5

Commits on Sep 30, 2021

• Disables computercraft village structures

  theboo

  authored
  f88098a

  Copy full SHA for f88098a

• [Expert] Astral Shuffle

  MuteTiefling

  committed
  68de9ba

  Copy full SHA for 68de9ba

• updates

  MuteTiefling

  committed
  6083780

  Copy full SHA for 6083780

• Merge pull request #3341 from MuteTiefling/CM-on-Morph

  Show description for 812b978
  NielsPilgaard

  authored
  812b978

  Copy full SHA for 812b978

• Merge pull request #3342 from NillerMedDild/CCYEET

  Show description for a90ea14
  NielsPilgaard

  authored
  a90ea14

  Copy full SHA for a90ea14

• Merge pull request #3335 from MuteTiefling/BM-Updates

  Show description for 5557b8c
  NielsPilgaard

  authored
  5557b8c

  Copy full SHA for 5557b8c

• fixed #3334

  NielsPilgaard

  committed
  a609292

  Copy full SHA for a609292

• Merge branch 'develop' of https://github.com/NillerMedDild/Enigmatica6 into develop

  NielsPilgaard

  committed
  57bc1f2

  Copy full SHA for 57bc1f2

• added personal shrinking device to morph-o-tool filling recipe #3341

  NielsPilgaard

  committed
  4a04264

  Copy full SHA for 4a04264

• set expert mode quest in getting started to be optional #3323

  NielsPilgaard

  committed
  5da94fd

  Copy full SHA for 5da94fd

• latex ponder: idle 1 tick before modifying nbt on newly placed block, fixes a rare crash

  NielsPilgaard

  committed
  ab39d3c

  Copy full SHA for ab39d3c

• update

  MuteTiefling

  committed
  6dcd1b2

  Copy full SHA for 6dcd1b2

Commits on Oct 1, 2021

• refreshes byg config

  theboo

  authored
  ffd5acb

  Copy full SHA for ffd5acb

• Merge pull request #3346 from theboo/develop

  Show description for f31d276
  NielsPilgaard

  authored
  f31d276

  Copy full SHA for f31d276

• lenses

  MuteTiefling

  committed
  61673ec

  Copy full SHA for 61673ec

• mana spreaders

  Show description for dbc7038
  MuteTiefling

  committed
  dbc7038

  Copy full SHA for dbc7038

• firmament

  MuteTiefling

  committed
  05484d6

  Copy full SHA for 05484d6

• Merge branch 'develop' into astral-progression-changes

  MuteTiefling

  committed
  46fb8af

  Copy full SHA for 46fb8af

Commits on Oct 2, 2021

• dark utils

  MuteTiefling

  committed
  cbd114e

  Copy full SHA for cbd114e

• remove mana dust from infusion

  MuteTiefling

  committed
  deb27e8

  Copy full SHA for deb27e8

• Merge pull request #54 from NillerMedDild/develop

  Show description for cac826c
  Ridanisaurus

  authored
  cac826c

  Copy full SHA for cac826c

• Building Quest Chapter 1 of 2

  Ridanisaurus

  committed
  6d7bb24

  Copy full SHA for 6d7bb24

• Merge pull request #3343 from MuteTiefling/astral-progression-changes

  Show description for 6c29ae1
  NielsPilgaard

  authored
  6c29ae1

  Copy full SHA for 6c29ae1

• changed randompatches configswapper configs to new format, hopefully this works :D

  NielsPilgaard

  committed
  e6c34bd

  Copy full SHA for e6c34bd

• Merge branch 'develop' of https://github.com/NillerMedDild/Enigmatica6 into develop

  NielsPilgaard

  committed
  6af4b5f

  Copy full SHA for 6af4b5f

• ignore client configs

  NielsPilgaard

  committed
  aa709ab

  Copy full SHA for aa709ab

• Update building.snbt

  Ridanisaurus

  committed
  f82e15d

  Copy full SHA for f82e15d

• mod updates

  NielsPilgaard

  committed
  37caa77

  Copy full SHA for 37caa77

• fixed gunpowder to sulfur recipe I think

  NielsPilgaard

  committed
  87ce3ea

  Copy full SHA for 87ce3ea

• Merge pull request #3355 from Ridanisaurus/develop

  Show description for 0986c2a
  MuteTiefling

  authored
  0986c2a

  Copy full SHA for 0986c2a

Commits on Oct 3, 2021

• update to rid's quests

  Show description for bfe1f34
  MuteTiefling

  committed
  bfe1f34

  Copy full SHA for bfe1f34

• Merge pull request #3360 from MuteTiefling/develop

  Show description for be411f1
  MuteTiefling

  authored
  be411f1

  Copy full SHA for be411f1

• Merge pull request #55 from NillerMedDild/develop

  Show description for eb3eb27
  Ridanisaurus

  authored
  eb3eb27

  Copy full SHA for eb3eb27

• typos, woops!

  Show description for 95d6a52
  MuteTiefling

  committed
  95d6a52

  Copy full SHA for 95d6a52

• Merge pull request #3361 from MuteTiefling/develop

  Show description for 95579d1
  MuteTiefling

  authored
  95579d1

  Copy full SHA for 95579d1

• Update building.snbt

  Ridanisaurus

  committed
  6b25792

  Copy full SHA for 6b25792

• Update to magical ore processing

  Show description for bc5af27
  MuteTiefling

  committed
  bc5af27

  Copy full SHA for bc5af27

• Merge pull request #3364 from MuteTiefling/develop

  Show description for f2b8ff3
  MuteTiefling

  authored
  f2b8ff3

  Copy full SHA for f2b8ff3

• Proof-reading touch up

  Show description for 4c34ab1
  MuteTiefling

  authored
  4c34ab1

  Copy full SHA for 4c34ab1

• Update building.snbt

  MuteTiefling

  authored
  512eed1

  Copy full SHA for 512eed1

• Merge pull request #3362 from Ridanisaurus/develop

  Show description for c8daf51
  MuteTiefling

  authored
  c8daf51

  Copy full SHA for c8daf51

• Add Blazing Blood as fuel for the Magmatic Dynamo

  Show description for 42a4458
  MuteTiefling

  committed
  42a4458

  Copy full SHA for 42a4458

• Merge pull request #3368 from MuteTiefling/develop

  Show description for fc05adf
  MuteTiefling

  authored
  fc05adf

  Copy full SHA for fc05adf

• Merge branch 'develop' into thermal-power-upgrade

  MuteTiefling

  committed
  f952fe7

  Copy full SHA for f952fe7

• added friendly fire #3358

  NielsPilgaard

  committed
  81c0b22

  Copy full SHA for 81c0b22

• fixed create belts sometimes not displaying their items (Credit Iris-6) #3367

  NielsPilgaard

  committed
  4433827

  Copy full SHA for 4433827

• Attempting to add subtypes...

  Show description for 4a76895
  MuteTiefling

  committed
  4a76895

  Copy full SHA for 4a76895

• re-show items

  Show description for 38d30be
  MuteTiefling

  committed
  38d30be

  Copy full SHA for 38d30be

• remove sword augment!

  MuteTiefling

  committed
  c017a0f

  Copy full SHA for c017a0f

Commits on Oct 4, 2021

• Update jei_add_items.js

  MuteTiefling

  committed
  9b7ef70

  Copy full SHA for 9b7ef70

• refactor thermal fuel scripts

  Show description for efd94cd
  MuteTiefling

  committed
  efd94cd

  Copy full SHA for efd94cd

• Merge pull request #3371 from MuteTiefling/develop

  Show description for 8c5e22a
  MuteTiefling

  authored
  8c5e22a

  Copy full SHA for 8c5e22a

• Merge pull request #3303 from MuteTiefling/thermal-power-upgrade

  Show description for c76aaa2
  NielsPilgaard

  authored
  c76aaa2

  Copy full SHA for c76aaa2

• Remove ender slime from tinkers tree fluids

  Show description for d2ad8de
  MuteTiefling

  committed
  d2ad8de

  Copy full SHA for d2ad8de

• Merge pull request #3374 from MuteTiefling/develop

  Show description for 8d239a7
  MuteTiefling

  authored
  8d239a7

  Copy full SHA for 8d239a7

• tried fixing #3373 no luck yet

  NielsPilgaard

  committed
  6fe5133

  Copy full SHA for 6fe5133

• blocked adv. demagnetizer from having quark buttons, not that it does atm :D

  NielsPilgaard

  committed
  63699b8

  Copy full SHA for 63699b8

Commits on Oct 5, 2021

• fixes #3207

  NielsPilgaard

  committed
  ac76e92

  Copy full SHA for ac76e92

• add sushigocrafting avokado leaves to minecraft:leaves tag, fixes #3376

  NielsPilgaard

  committed
  1e27f50

  Copy full SHA for 1e27f50

• actually fix #3373

  NielsPilgaard

  committed
  3890d63

  Copy full SHA for 3890d63

• future proofing for the adv. demagnetizer not voiding/duping

  NielsPilgaard

  committed
  dbf0d05

  Copy full SHA for dbf0d05

Commits on Oct 6, 2021

• add missing glowshrooms to vanilla nether shrooms

  Show description for 32c84b4
  MuteTiefling

  committed
  32c84b4

  Copy full SHA for 32c84b4

• Merge pull request #3386 from MuteTiefling/develop

  Show description for b4f1c80
  MuteTiefling

  authored
  b4f1c80

  Copy full SHA for b4f1c80

• re-disabled various supplementaries items

  theboo

  authored
  0bae1ce

  Copy full SHA for 0bae1ce

• un-hid supplementaries items we have enabled

  theboo

  authored
  cfa1e2a

  Copy full SHA for cfa1e2a

• Merge pull request #3387 from theboo/develop

  Show description for 420f920
  theboo

  authored
  420f920

  Copy full SHA for 420f920

• removed unneeded blocks from valid apiary tag const

  theboo

  authored
  4c6585b

  Copy full SHA for 4c6585b

• removed removeAll from script

  theboo

  authored
  a563dd2

  Copy full SHA for a563dd2

• removed removeAll from script

  theboo

  authored
  b757740

  Copy full SHA for b757740

• left a comma!

  theboo

  authored
  86104a3

  Copy full SHA for 86104a3

• Fix firework descriptions

  Show description for ab6a505
  MuteTiefling

  committed
  ab6a505

  Copy full SHA for ab6a505

• Merge pull request #3389 from MuteTiefling/develop

  Show description for c413d16
  MuteTiefling

  authored
  c413d16

  Copy full SHA for c413d16

• Merge pull request #3388 from theboo/develop

  Show description for 2162c75
  NielsPilgaard

  authored
  2162c75

  Copy full SHA for 2162c75

• [expert] fix compressors dropping compressed bricks in normal mode

  Show description for db728f0
  MuteTiefling

  committed
  db728f0

  Copy full SHA for db728f0

• Merge pull request #3391 from MuteTiefling/develop

  Show description for f26c4b0
  MuteTiefling

  authored
  f26c4b0

  Copy full SHA for f26c4b0

• #1438

  NielsPilgaard

  committed
  3c11586

  Copy full SHA for 3c11586

Commits on Oct 7, 2021

• Fix oil in neromantic prime. Fix recipe loop for expert mana spreader

  Show description for 597edfc
  MuteTiefling

  committed
  597edfc

  Copy full SHA for 597edfc

• Merge pull request #3394 from MuteTiefling/develop

  Show description for ae38ff7
  MuteTiefling

  authored
  ae38ff7

  Copy full SHA for ae38ff7

• Update settings.ps1

  NielsPilgaard

  committed
  6f07bca

  Copy full SHA for 6f07bca

• [Expert] Swap Tremblecrust for Shiverstone

  Show description for d652daf
  MuteTiefling

  committed
  d652daf

  Copy full SHA for d652daf

• Merge remote-tracking branch 'upstream/develop' into develop

  MuteTiefling

  committed
  b226b0a

  Copy full SHA for b226b0a

Commits on Oct 8, 2021

• Refined Storage

  Show description for a427445
  MuteTiefling

  committed
  a427445

  Copy full SHA for a427445

• Update pressure_chamber.js

  MuteTiefling

  committed
  66e0370

  Copy full SHA for 66e0370

• Merge pull request #3395 from MuteTiefling/develop

  Show description for 228f8e0
  NielsPilgaard

  authored
  228f8e0

  Copy full SHA for 228f8e0

• Update pressure_chamber.js

  MuteTiefling

  committed
  7b15388

  Copy full SHA for 7b15388

• Update shaped.js

  MuteTiefling

  committed
  5c158eb

  Copy full SHA for 5c158eb

• crafter update

  MuteTiefling

  committed
  07e1573

  Copy full SHA for 07e1573

• [Expert] Squirrel Power!

  Show description for 0860255
  MuteTiefling

  committed
  0860255

  Copy full SHA for 0860255

• Delete waystones-server.toml

  NielsPilgaard

  committed
  d1e925d

  Copy full SHA for d1e925d

• Revert "Delete waystones-server.toml"

  Show description for dfa91cc
  NielsPilgaard

  committed
  dfa91cc

  Copy full SHA for dfa91cc

• Merge pull request #3399 from MuteTiefling/create-recipes

  Show description for fc67a64
  NielsPilgaard

  authored
  fc67a64

  Copy full SHA for fc67a64

• upgrades

  MuteTiefling

  committed
  ed41d12

  Copy full SHA for ed41d12

• [Expert] Misc recipe

  MuteTiefling

  committed
  919f6cd

  Copy full SHA for 919f6cd

Commits on Oct 9, 2021

• Update shaped.js

  MuteTiefling

  authored
  faae32e

  Copy full SHA for faae32e

• fix ma derps

  MuteTiefling

  committed
  3489836

  Copy full SHA for 3489836

• Merge pull request #3402 from MuteTiefling/misc-recipes-take-two

  Show description for 32412cf
  NielsPilgaard

  authored
  32412cf

  Copy full SHA for 32412cf

• Merge pull request #3397 from MuteTiefling/expert-recipes

  Show description for 66beff3
  NielsPilgaard

  authored
  66beff3

  Copy full SHA for 66beff3

• fixed dense construction block recipe being way too expensive #3400

  NielsPilgaard

  committed
  24669ed

  Copy full SHA for 24669ed

• mod updates

  NielsPilgaard

  committed
  228948e

  Copy full SHA for 228948e

• Update Crowdin configuration file

  NielsPilgaard

  committed
  0e3fe19

  Copy full SHA for 0e3fe19

Commits on Oct 10, 2021

• mod updates

  NielsPilgaard

  committed
  35652a5

  Copy full SHA for 35652a5

• added recipe for clearing nbt of redstone transmitter/receiver, fixes #3372

  NielsPilgaard

  committed
  ebbb365

  Copy full SHA for ebbb365

• copied powahAPI stuff from PR that targetted master, credit will be given still ofc

  NielsPilgaard

  committed
  be459e6

  Copy full SHA for be459e6

• added tags to BYG nether ores

  NielsPilgaard

  committed
  c7df927

  Copy full SHA for c7df927

• melting recipes for emerald/diamond plates, rods and gears, fixes #3064

  NielsPilgaard

  committed
  41ae32b

  Copy full SHA for 41ae32b

• adjusted xp fluid conversion recipes, fixes #3359

  NielsPilgaard

  committed
  5c048ec

  Copy full SHA for 5c048ec

• Update CHANGELOG.md

  NielsPilgaard

  committed
  e005b65

  Copy full SHA for e005b65

• Remove total myth botany override. switch to smarter, more targeted overrides

  Show description for 89bf1b6
  MuteTiefling

  committed
  89bf1b6

  Copy full SHA for 89bf1b6

Commits on Oct 11, 2021

• Merge pull request #3410 from MuteTiefling/develop

  Show description for 1bc4c8f
  NielsPilgaard

  authored
  1bc4c8f

  Copy full SHA for 1bc4c8f

• enabled the roadrunner mixin ai.pathing \o/

  NielsPilgaard

  committed
  b993270

  Copy full SHA for b993270

• mod updates

  NielsPilgaard

  committed
  96a04f0

  Copy full SHA for 96a04f0

• Merge branch 'develop' of https://github.com/NillerMedDild/Enigmatica6 into develop

  NielsPilgaard

  committed
  94afaae

  Copy full SHA for 94afaae

• hide farmersdelight:fried_egg from JEI and SoL:CE

  NielsPilgaard

  committed
  0299b26

  Copy full SHA for 0299b26

• add environmental fried egg to protein list

  NielsPilgaard

  committed
  6d4bf81

  Copy full SHA for 6d4bf81

• delete solcarrot server config to update blacklist

  NielsPilgaard

  committed
  51a18db

  Copy full SHA for 51a18db

• simplify recipes to clear redstone transmitter/receiver

  NielsPilgaard

  committed
  059f59d

  Copy full SHA for 059f59d

• Merge branch 'master' into develop

  NielsPilgaard

  committed
  9fae0d4

  Copy full SHA for 9fae0d4