From eb162e578aa94e8e8eabaa389da72de9d536228f Mon Sep 17 00:00:00 2001 From: Rich Geldreich Date: Mon, 20 Feb 2023 18:13:45 -0500 Subject: [PATCH 01/13] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index baddf72..ce9ba28 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ * Dr. Jacques F. Vallée - Copyright (c) 1993 * Richard Geldreich, Jr. - Copyright (c) 2023 * NICAP - Unknown copyright status +* Some portions of the specific file udb_tables.h (such as get_hatch_geo, g_hatch_continents) use strings from the ["uDb" project by Jérôme Beau](https://github.com/RR0/uDb). The license of his project us known. Note: Although the C++ tool itself is open source with a permissive license (Apache 2.0), any commercial use of the copyrighted data in this repository may require permission from one or more copyright holders. From b58d4c481c8b2885ebcd046d2b0b585223208dc9 Mon Sep 17 00:00:00 2001 From: Rich Geldreich Date: Mon, 20 Feb 2023 18:16:06 -0500 Subject: [PATCH 02/13] Update README.md --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ce9ba28..fcda3b9 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,13 @@ # UFO Event Timeline Processing Tool ## Copyrights: -[ufojson](https://github.com/richgel999/ufo_data) tool: Copyright (c) 2023 By [Richard Geldreich, Jr.](https://medium.com/@richgel99) (Apache 2.0 license) +* [ufojson](https://github.com/richgel999/ufo_data) tool: Copyright (c) 2023 By [Richard Geldreich, Jr.](https://medium.com/@richgel99) (Apache 2.0 license) -[libsoldout](https://github.com/faelys/libsoldout): Copyright (c) 2009, Natacha Porté (ISC license) +* [libsoldout](https://github.com/faelys/libsoldout): Copyright (c) 2009, Natacha Porté (ISC license) -[json](https://github.com/nlohmann/json): Copyright (c) 2013-2022 Niels Lohmann (MIT license) +* [json](https://github.com/nlohmann/json): Copyright (c) 2013-2022 Niels Lohmann (MIT license) + +* Some portions of the specific file udb_tables.h (such as get_hatch_geo, g_hatch_continents) use strings/tables from the ["uDb" project by Jérôme Beau](https://github.com/RR0/uDb). ## Data files (in 'bin' directory): * George M. Eberhart - Copyright (c) 2022 @@ -15,7 +17,7 @@ * Dr. Jacques F. Vallée - Copyright (c) 1993 * Richard Geldreich, Jr. - Copyright (c) 2023 * NICAP - Unknown copyright status -* Some portions of the specific file udb_tables.h (such as get_hatch_geo, g_hatch_continents) use strings from the ["uDb" project by Jérôme Beau](https://github.com/RR0/uDb). The license of his project us known. +* *U* binary database file U.RND: Copyright 1994-2002 [Larry Hatch](https://www.openminds.tv/larry-hatch-ufo-database-creator-remembered/42142) Note: Although the C++ tool itself is open source with a permissive license (Apache 2.0), any commercial use of the copyrighted data in this repository may require permission from one or more copyright holders. From 5450b0e56fd3da9131468df1180589e9bcdfb056 Mon Sep 17 00:00:00 2001 From: Rich Geldreich Date: Mon, 20 Feb 2023 18:16:16 -0500 Subject: [PATCH 03/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fcda3b9..b4f0652 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ * Dr. Jacques F. Vallée - Copyright (c) 1993 * Richard Geldreich, Jr. - Copyright (c) 2023 * NICAP - Unknown copyright status -* *U* binary database file U.RND: Copyright 1994-2002 [Larry Hatch](https://www.openminds.tv/larry-hatch-ufo-database-creator-remembered/42142) +* \*U\* binary database file U.RND: Copyright 1994-2002 [Larry Hatch](https://www.openminds.tv/larry-hatch-ufo-database-creator-remembered/42142) Note: Although the C++ tool itself is open source with a permissive license (Apache 2.0), any commercial use of the copyrighted data in this repository may require permission from one or more copyright holders. From d22c144ad98455f3b19dd890379ba001376f07a9 Mon Sep 17 00:00:00 2001 From: Rich Geldreich Date: Mon, 20 Feb 2023 18:17:06 -0500 Subject: [PATCH 04/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b4f0652..da58f01 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ * Some portions of the specific file udb_tables.h (such as get_hatch_geo, g_hatch_continents) use strings/tables from the ["uDb" project by Jérôme Beau](https://github.com/RR0/uDb). -## Data files (in 'bin' directory): +### Data files (in 'bin' directory): * George M. Eberhart - Copyright (c) 2022 * LeRoy Pea - Copyright (c) 9/8/1988 (updated 3/17/2005) * Dr. Donald A. Johnson - Copyright (c) 2012 From d0c1f95aa80c8a76b675a03fb7005a61e06ee1ab Mon Sep 17 00:00:00 2001 From: Rich Geldreich Date: Mon, 20 Feb 2023 19:32:42 -0500 Subject: [PATCH 05/13] Update README.md --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index da58f01..0aa686f 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ * Dr. Jacques F. Vallée - Copyright (c) 1993 * Richard Geldreich, Jr. - Copyright (c) 2023 * NICAP - Unknown copyright status -* \*U\* binary database file U.RND: Copyright 1994-2002 [Larry Hatch](https://www.openminds.tv/larry-hatch-ufo-database-creator-remembered/42142) +* \*U\* binary database file U.RND: Copyright 1994-2002 [Larry Hatch](https://www.openminds.tv/larry-hatch-ufo-database-creator-remembered/42142). According to David Marler, Executive Director of the [National UFO Historical Records Center](http://www.nufohrc.org/), "The family has verbally given permission for the database to be used. If you need to speak with them, I have their contact info." Note: Although the C++ tool itself is open source with a permissive license (Apache 2.0), any commercial use of the copyrighted data in this repository may require permission from one or more copyright holders. @@ -29,3 +29,8 @@ Currently, the tool is Windows only, but it would be trivial to port to Linux/OS Here's the output [Markdown file converted to PDF](ufo_timeline_v1_04.pdf). The latest HTML timeline is published [here](http://www.subquantumtech.com/timeline/timeline.html). +## Special Thanks + +* Thanks to David Marler, Executive Director of the [National UFO Historical Records Center](http://www.nufohrc.org/), for assistance in recovering Hatch's DOS-era UFO program. + +* Thanks to Jérôme Beau, creator of the ["uDb" project](https://github.com/RR0/uDb), for releasing his database tool. His output and code was very useful. From f1795e718bbc00e49452b59664909c993db21051 Mon Sep 17 00:00:00 2001 From: Rich Geldreich Date: Mon, 20 Feb 2023 19:36:32 -0500 Subject: [PATCH 06/13] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0aa686f..9352b49 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # UFO Event Timeline Processing Tool ## Copyrights: + +### Code: * [ufojson](https://github.com/richgel999/ufo_data) tool: Copyright (c) 2023 By [Richard Geldreich, Jr.](https://medium.com/@richgel99) (Apache 2.0 license) * [libsoldout](https://github.com/faelys/libsoldout): Copyright (c) 2009, Natacha Porté (ISC license) From 3746b374154095c2bda731308b847b77f27c2528 Mon Sep 17 00:00:00 2001 From: Rich Geldreich Date: Mon, 20 Feb 2023 19:37:06 -0500 Subject: [PATCH 07/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9352b49..aef41eb 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ ### Data files (in 'bin' directory): * George M. Eberhart - Copyright (c) 2022 -* LeRoy Pea - Copyright (c) 9/8/1988 (updated 3/17/2005) +* LeRoy Pea - Copyright (c) 9/8/1988 (updated 3/17/2005). Permission given for use as long as his name is associated with the records. * Dr. Donald A. Johnson - Copyright (c) 2012 * Fred Keziah - Copyright (c) 1958 * Dr. Jacques F. Vallée - Copyright (c) 1993 From 148ccaf2e27801edb3548fa99577c6cb243f91e7 Mon Sep 17 00:00:00 2001 From: Rich Geldreich Date: Mon, 20 Feb 2023 19:37:24 -0500 Subject: [PATCH 08/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aef41eb..5ecb93f 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ ### Data files (in 'bin' directory): * George M. Eberhart - Copyright (c) 2022 -* LeRoy Pea - Copyright (c) 9/8/1988 (updated 3/17/2005). Permission given for use as long as his name is associated with the records. +* LeRoy Pea - Copyright (c) 9/8/1988 (updated 3/17/2005). Permission was given for use as long as he is attributed. * Dr. Donald A. Johnson - Copyright (c) 2012 * Fred Keziah - Copyright (c) 1958 * Dr. Jacques F. Vallée - Copyright (c) 1993 From 1f27cf445984fa97c5c234fd999f4f3b39b650f7 Mon Sep 17 00:00:00 2001 From: Rich Geldreich Date: Mon, 20 Feb 2023 19:38:42 -0500 Subject: [PATCH 09/13] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5ecb93f..0ee694f 100644 --- a/README.md +++ b/README.md @@ -17,11 +17,11 @@ * Dr. Donald A. Johnson - Copyright (c) 2012 * Fred Keziah - Copyright (c) 1958 * Dr. Jacques F. Vallée - Copyright (c) 1993 -* Richard Geldreich, Jr. - Copyright (c) 2023 +* Richard Geldreich, Jr. - Copyright (c) 2023 - Commercial usage is acceptable as long as attribution is given. * NICAP - Unknown copyright status * \*U\* binary database file U.RND: Copyright 1994-2002 [Larry Hatch](https://www.openminds.tv/larry-hatch-ufo-database-creator-remembered/42142). According to David Marler, Executive Director of the [National UFO Historical Records Center](http://www.nufohrc.org/), "The family has verbally given permission for the database to be used. If you need to speak with them, I have their contact info." -Note: Although the C++ tool itself is open source with a permissive license (Apache 2.0), any commercial use of the copyrighted data in this repository may require permission from one or more copyright holders. +Note: Although the C++ tool itself is open source with a permissive license (Apache 2.0), **any commercial use of the copyrighted data in this repository may require permission from one or more copyright holders**. ## Instructions From d091c34d30afcc05cdc525c64d1c4618b730e4a3 Mon Sep 17 00:00:00 2001 From: Rich Geldreich Date: Mon, 20 Feb 2023 19:39:26 -0500 Subject: [PATCH 10/13] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0ee694f..c0f6800 100644 --- a/README.md +++ b/README.md @@ -12,17 +12,17 @@ * Some portions of the specific file udb_tables.h (such as get_hatch_geo, g_hatch_continents) use strings/tables from the ["uDb" project by Jérôme Beau](https://github.com/RR0/uDb). ### Data files (in 'bin' directory): +Although the C++ tool itself is open source with a permissive license (Apache 2.0), **any commercial use of the copyrighted data in this repository (in any format, textual, JSON, Markdown, HTML etc.) may require permission from one or more copyright holders**: + * George M. Eberhart - Copyright (c) 2022 * LeRoy Pea - Copyright (c) 9/8/1988 (updated 3/17/2005). Permission was given for use as long as he is attributed. * Dr. Donald A. Johnson - Copyright (c) 2012 * Fred Keziah - Copyright (c) 1958 * Dr. Jacques F. Vallée - Copyright (c) 1993 -* Richard Geldreich, Jr. - Copyright (c) 2023 - Commercial usage is acceptable as long as attribution is given. +* Richard Geldreich, Jr. - Copyright (c) 2023. Commercial usage is acceptable as long as attribution is given. * NICAP - Unknown copyright status * \*U\* binary database file U.RND: Copyright 1994-2002 [Larry Hatch](https://www.openminds.tv/larry-hatch-ufo-database-creator-remembered/42142). According to David Marler, Executive Director of the [National UFO Historical Records Center](http://www.nufohrc.org/), "The family has verbally given permission for the database to be used. If you need to speak with them, I have their contact info." -Note: Although the C++ tool itself is open source with a permissive license (Apache 2.0), **any commercial use of the copyrighted data in this repository may require permission from one or more copyright holders**. - ## Instructions This C++ command line tool reads several source files containing UFO related events, which were compiled from a variety of sources, and converts each of them to JSON. It then sorts all of these events into a single large timeline and outputs them as the Markdown file "timeline.md" and the JSON file "majestic.json". [pandoc](https://pandoc.org/) can then be used to convert this Markdown text file to HTML. From 14d1e40468dae1058f2a69f71f8868a9e73bada8 Mon Sep 17 00:00:00 2001 From: Rich Geldreich Date: Mon, 20 Feb 2023 19:39:53 -0500 Subject: [PATCH 11/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c0f6800..3257fa1 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ * Some portions of the specific file udb_tables.h (such as get_hatch_geo, g_hatch_continents) use strings/tables from the ["uDb" project by Jérôme Beau](https://github.com/RR0/uDb). ### Data files (in 'bin' directory): -Although the C++ tool itself is open source with a permissive license (Apache 2.0), **any commercial use of the copyrighted data in this repository (in any format, textual, JSON, Markdown, HTML etc.) may require permission from one or more copyright holders**: +Although the C++ tool itself is open source with a permissive license (Apache 2.0), **any commercial use of the copyrighted data in this repository (in any format, textual, JSON, Markdown, HTML, raw binary records, etc.) may require permission from one or more copyright holders**: * George M. Eberhart - Copyright (c) 2022 * LeRoy Pea - Copyright (c) 9/8/1988 (updated 3/17/2005). Permission was given for use as long as he is attributed. From e707b0a86e45e016b59bc942d7c12ede76f8dba8 Mon Sep 17 00:00:00 2001 From: Rich Geldreich Date: Mon, 20 Feb 2023 19:40:58 -0500 Subject: [PATCH 12/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3257fa1..27fcc15 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Although the C++ tool itself is open source with a permissive license (Apache 2. * Dr. Donald A. Johnson - Copyright (c) 2012 * Fred Keziah - Copyright (c) 1958 * Dr. Jacques F. Vallée - Copyright (c) 1993 -* Richard Geldreich, Jr. - Copyright (c) 2023. Commercial usage is acceptable as long as attribution is given. +* Richard Geldreich, Jr. - Copyright (c) 2023. Commercial usage permitted as long as attribution is given. * NICAP - Unknown copyright status * \*U\* binary database file U.RND: Copyright 1994-2002 [Larry Hatch](https://www.openminds.tv/larry-hatch-ufo-database-creator-remembered/42142). According to David Marler, Executive Director of the [National UFO Historical Records Center](http://www.nufohrc.org/), "The family has verbally given permission for the database to be used. If you need to speak with them, I have their contact info." From 62caf3b368fb712d324f0e78855640d3bbb92c44 Mon Sep 17 00:00:00 2001 From: Rich Geldreich Date: Mon, 20 Feb 2023 20:03:17 -0500 Subject: [PATCH 13/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 27fcc15..e5bc7a8 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Although the C++ tool itself is open source with a permissive license (Apache 2. * George M. Eberhart - Copyright (c) 2022 * LeRoy Pea - Copyright (c) 9/8/1988 (updated 3/17/2005). Permission was given for use as long as he is attributed. * Dr. Donald A. Johnson - Copyright (c) 2012 -* Fred Keziah - Copyright (c) 1958 +* Fred Keziah - Copyright (c) 1958. This poster hasn't been updated in 65 years, so it's probably fine for commercial usage. * Dr. Jacques F. Vallée - Copyright (c) 1993 * Richard Geldreich, Jr. - Copyright (c) 2023. Commercial usage permitted as long as attribution is given. * NICAP - Unknown copyright status