Skip to content

Commit bf1397b

Browse files
author
MARCHING-PC\Gray
committed
Merge branch 'develop'
# Conflicts: # data/media.xlsx
2 parents d039a09 + 6dda9c2 commit bf1397b

99 files changed

Lines changed: 29541 additions & 23370 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎_Holy_Bible/007.html‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -254,16 +254,14 @@ <h4>The Hamites</h4>
254254
</blockquote>
255255
</div>
256256
<p><sup>8</sup>Cush was the father<a id="filepos334946" href="009.html#filepos656715"><sup>[40]</sup></a> of Nimrod, who became a mighty warrior on the earth. <sup>9</sup>He was a mighty hunter before the LORD; that is why it is said, “Like Nimrod, a mighty hunter before the LORD.” <sup>10</sup>The first centers of his kingdom were Babylon, Uruk, Akkad and Kalneh, in<a id="filepos335380" href="009.html#filepos657265"><sup>[41]</sup></a> Shinar.<a id="filepos335474" href="009.html#filepos657536"><sup>[42]</sup></a> <sup>11</sup>From that land he went to Assyria, where he built Nineveh, Rehoboth Ir,<a id="filepos335645" href="009.html#filepos657780"><sup>[43]</sup></a> Calah <sup>12</sup>and Resen, which is between Nineveh and Calah—which is the great city.</p>
257-
<div>
258-
<p id="filepos335888"><sup>13</sup>Egypt was the father of</p>
259-
<blockquote>
260-
<p>the Ludites, Anamites, Lehabites, Naphtuhites, <sup>14</sup>Pathrusites, Kasluhites (from whom the Philistines came) and Caphtorites.</p>
261-
</blockquote>
262-
<p id="filepos336282"><sup>15</sup>Canaan was the father of</p>
263-
<blockquote>
264-
<p>Sidon his firstborn,<a id="filepos336515" href="009.html#filepos658045"><sup>[44]</sup></a> and of the Hittites, <sup>16</sup>Jebusites, Amorites, Girgashites, <sup>17</sup>Hivites, Arkites, Sinites, <sup>18</sup>Arvadites, Zemarites and Hamathites.</p>
265-
</blockquote>
266-
</div>
257+
<p id="filepos335888"><sup>13</sup>Egypt was the father of</p>
258+
<blockquote>
259+
<p>the Ludites, Anamites, Lehabites, Naphtuhites, <sup>14</sup>Pathrusites, Kasluhites (from whom the Philistines came) and Caphtorites.</p>
260+
</blockquote>
261+
<p id="filepos336282"><sup>15</sup>Canaan was the father of</p>
262+
<blockquote>
263+
<p>Sidon his firstborn,<a id="filepos336515" href="009.html#filepos658045"><sup>[44]</sup></a> and of the Hittites, <sup>16</sup>Jebusites, Amorites, Girgashites, <sup>17</sup>Hivites, Arkites, Sinites, <sup>18</sup>Arvadites, Zemarites and Hamathites.</p>
264+
</blockquote>
267265
<p>Later the Canaanite clans scattered <sup>19</sup>and the borders of Canaan reached from Sidon toward Gerar as far as Gaza, and then toward Sodom, Gomorrah, Admah and Zeboyim, as far as Lasha.</p>
268266
<p id="filepos337111"><sup>20</sup>These are the sons of Ham by their clans and languages, in their territories and nations.</p>
269267
</section>
@@ -278,10 +276,7 @@ <h4>The Semites</h4>
278276
<p id="filepos338060"><sup>23</sup>The sons of Aram:</p>
279277
<blockquote>
280278
<p>Uz, Hul, Gether and Meshek.<a id="filepos338293" href="009.html#filepos658573"><sup>[46]</sup></a></p>
281-
</blockquote>
282-
<p id="filepos338428"><sup>24</sup>Arphaxad was the father of<a id="filepos338531" href="009.html#filepos658905"><sup>[47]</sup></a> Shelah,</p>
283-
<blockquote>
284-
<p>and Shelah the father of Eber.</p>
279+
<p id="filepos338428"><sup>24</sup>Arphaxad was the father of<a id="filepos338531" href="009.html#filepos658905"><sup>[47]</sup></a> Shelah, and Shelah the father of Eber.</p>
285280
</blockquote>
286281
<p><sup>25</sup>Two sons were born to Eber:</p>
287282
<blockquote>

‎_Holy_Bible/008.html‎

Lines changed: 153 additions & 227 deletions
Large diffs are not rendered by default.

‎_Holy_Bible/010.html‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -417,32 +417,14 @@ <h4>The Ten Commandments</h4>
417417
<p><sup>2</sup> “I am the LORD your God, who brought you out of Egypt, out of the land of slavery.</p>
418418
<blockquote>
419419
<p><sup>3</sup> “You shall have no other gods before <a id="filepos848416" href="011.html#filepos1003208"><sup>[48]</sup></a> me.</p>
420-
</blockquote>
421-
<blockquote>
422-
<p id="filepos848555"><sup>4</sup> “You shall not make for yourself an image in the form of anything in heaven above or on the earth beneath or in the waters below. <sup id="filepos848779">5</sup> You shall not bow down to them or worship them; for I, the LORD your God, am a jealous God, punishing the children for the sin of the parents to the third and fourth generation of those who hate me, <sup>6</sup> but showing love to a thousand generations of those who love me and keep my commandments.</p>
423-
</blockquote>
424-
<blockquote>
425-
<p><sup>7</sup> “You shall not misuse the name of the LORD your God, for the LORD will not hold anyone guiltless who misuses his name.</p>
426-
</blockquote>
427-
<blockquote>
428-
<p><sup>8</sup> “Remember the Sabbath day by keeping it holy. <sup>9</sup> Six days you shall labor and do all your work, <sup>10</sup> but the seventh day is a sabbath to the LORD your God. On it you shall not do any work, neither you, nor your son or daughter, nor your male or female servant, nor your animals, nor any foreigner residing in your towns. <sup>11</sup> For in six days the LORD made the heavens and the earth, the sea, and all that is in them, but he rested on the seventh day. Therefore the LORD blessed the Sabbath day and made it holy.</p>
429-
</blockquote>
430-
<blockquote>
420+
<p id="filepos848555"><sup>4</sup> “You shall not make for yourself an image in the form of anything in heaven above or on the earth beneath or in the waters below. <sup id="filepos848779">5</sup> You shall not bow down to them or worship them; for I, the LORD your God, am a jealous God, punishing the children for the sin of the parents to the third and fourth generation of those who hate me, <sup>6</sup> but showing love to a thousand generations of those who love me and keep my commandments.</p>
421+
<p><sup>7</sup> “You shall not misuse the name of the LORD your God, for the LORD will not hold anyone guiltless who misuses his name.</p>
422+
<p><sup>8</sup> “Remember the Sabbath day by keeping it holy. <sup>9</sup> Six days you shall labor and do all your work, <sup>10</sup> but the seventh day is a sabbath to the LORD your God. On it you shall not do any work, neither you, nor your son or daughter, nor your male or female servant, nor your animals, nor any foreigner residing in your towns. <sup>11</sup> For in six days the LORD made the heavens and the earth, the sea, and all that is in them, but he rested on the seventh day. Therefore the LORD blessed the Sabbath day and made it holy.</p>
431423
<p id="filepos850296"><sup>12</sup> “Honor your father and your mother, so that you may live long in the land the LORD your God is giving you.</p>
432-
</blockquote>
433-
<blockquote>
434424
<p id="filepos850582"><sup>13</sup> “You shall not murder.</p>
435-
</blockquote>
436-
<blockquote>
437425
<p id="filepos850748"><sup>14</sup> “You shall not commit adultery.</p>
438-
</blockquote>
439-
<blockquote>
440426
<p><sup>15</sup> “You shall not steal.</p>
441-
</blockquote>
442-
<blockquote>
443427
<p><sup>16</sup> “You shall not give false testimony against your neighbor.</p>
444-
</blockquote>
445-
<blockquote>
446428
<p id="filepos851290"><sup>17</sup> “You shall not covet your neighbor’s house. You shall not covet your neighbor’s wife, or his male or female servant, his ox or donkey, or anything that belongs to your neighbor.”</p>
447429
</blockquote>
448430
<p><sup>18</sup> When the people saw the thunder and lightning and heard the trumpet and saw the mountain in smoke, they trembled with fear. They stayed at a distance <sup>19</sup> and said to Moses, “Speak to us yourself and we will listen. But do not have God speak to us or we will die.”</p>

‎_Holy_Bible/011.html‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,9 @@ <h4>The Golden Calf</h4>
129129
</section>
130130
<section id="filepos933485">
131131
<h3><a href="004.html#filepos37174">Exodus 33</a></h3>
132-
<section>
133-
<p><sup>1</sup> Then the LORD said to Moses, “Leave this place, you and the people you brought up out of Egypt, and go up to the land I promised on oath to Abraham, Isaac and Jacob, saying, ‘I will give it to your descendants.’ <sup>2</sup> I will send an angel before you and drive out the Canaanites, Amorites, Hittites, Perizzites, Hivites and Jebusites. <sup>3</sup> Go up to the land flowing with milk and honey. But I will not go with you, because you are a stiff-necked people and I might destroy you on the way.”</p>
134-
<p><sup>4</sup> When the people heard these distressing words, they began to mourn and no one put on any ornaments. <sup>5</sup> For the LORD
135-
had said to Moses, “Tell the Israelites, ‘You are a stiff-necked people. If I were to go with you even for a moment, I might destroy you. Now take off your ornaments and I will decide what to do with you.’ ” <sup>6</sup> So the Israelites stripped off their ornaments at Mount Horeb.</p>
136-
</section>
132+
<p><sup>1</sup> Then the LORD said to Moses, “Leave this place, you and the people you brought up out of Egypt, and go up to the land I promised on oath to Abraham, Isaac and Jacob, saying, ‘I will give it to your descendants.’ <sup>2</sup> I will send an angel before you and drive out the Canaanites, Amorites, Hittites, Perizzites, Hivites and Jebusites. <sup>3</sup> Go up to the land flowing with milk and honey. But I will not go with you, because you are a stiff-necked people and I might destroy you on the way.”</p>
133+
<p><sup>4</sup> When the people heard these distressing words, they began to mourn and no one put on any ornaments. <sup>5</sup> For the LORD
134+
had said to Moses, “Tell the Israelites, ‘You are a stiff-necked people. If I were to go with you even for a moment, I might destroy you. Now take off your ornaments and I will decide what to do with you.’ ” <sup>6</sup> So the Israelites stripped off their ornaments at Mount Horeb.</p>
137135
<section>
138136
<h4>The Tent of Meeting</h4>
139137
<p><sup>7</sup> Now Moses used to take a tent and pitch it outside the camp some distance away, calling it the “tent of meeting.” Anyone inquiring of the LORD would go to the tent of meeting outside the camp. <sup>8</sup> And whenever Moses went out to the tent, all the people rose and stood at the entrances to their tents, watching Moses until he entered the tent. <sup>9</sup> As Moses went into the tent, the pillar of cloud would come down and stay at the entrance, while the LORD spoke with Moses. <sup>10</sup> Whenever the people saw the pillar of cloud standing at the entrance to the tent, they all stood and worshiped, each at the entrance to their tent. <sup>11</sup> TheLORD would speak to Moses face to face, as one speaks to a friend. Then Moses would return to the camp, but his young aide Joshua son of Nun did not leave the tent.</p>

0 commit comments

Comments
 (0)