tfgrid/info_tfgrid
30
3
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Activity

development to main periodic update #102

Merged
mik-tf merged 51 commits from development into main 2024-06-14 16:52:01 +00:00
Conversation 0 Commits 51 Files Changed 365 +8 -11
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f5723135a0 - Show all commits

11
collections/tech/primitives/network/mycelium.md
View File

@ -1,18 +1,9 @@
# Mycelium: Our Planetary Network
<<<<<<< HEAD
# Mycelium: Our Planetary Network as used in the TFGrid
![alt text](img/mycelium.png) ![alt text](img/mycelium.png)
=======
# Mycelium: Our Planetary Network
The planetary network called Mycelium is an overlay network which lives on top of the existing Internet or other peer-to-peer networks created. The planetary network called Mycelium is an overlay network which lives on top of the existing Internet or other peer-to-peer networks created.
![](img/planet_net_.jpg)
In the Mycelium network, everyone is connected to everyone. End-to-end encryption between users of an app and the app runs behind the network wall. In the Mycelium network, everyone is connected to everyone. End-to-end encryption between users of an app and the app runs behind the network wall.
>>>>>>> ba303b6e3eb8220bf2851a949db109e68ccd1f8c
!!wiki.include page:'tech:mycelium_incl.md' !!wiki.include page:'tech:mycelium_incl.md'

6
heroscript/tech/book_collections.md
View File

@ -18,4 +18,10 @@
!!doctree.add !!doctree.add
url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/partners_utilization' url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/partners_utilization'
!!doctree.add
url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/vindo'
!!doctree.add
url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/main/collections/mkondo'
``` ```