9
0
mirror of https://github.com/IrisDimensions/overworld.git synced 2025-12-29 03:39:15 +00:00
Commit Graph

1363 Commits

Author SHA1 Message Date
Brian Neumann-Fopiano
3b16ea029c Revert "Merge pull request #141 from IrisDimensions/revert-140-master"
This reverts commit 9f19f98a76.
2021-07-18 23:23:17 -07:00
Brian Neumann-Fopiano
9f19f98a76 Merge pull request #141 from IrisDimensions/revert-140-master
Revert "Ok here we go"
2021-07-18 16:17:57 -07:00
Brian Neumann-Fopiano
39f352d647 Revert "Ok here we go" 2021-07-18 16:17:27 -07:00
Brian Neumann-Fopiano
22add45334 Merge pull request #140 from CocoTheOwner/master
Ok here we go
2021-07-18 16:16:56 -07:00
Brian Fopiano
5cf44a4dba ClutterChanges 2021-07-18 16:15:13 -07:00
CocoTheOwner
81b7a58e99 with good faith. first try? maybe. a man can dream 2021-07-19 01:14:26 +02:00
CocoTheOwner
f0b67b91f6 pog 2021-07-19 00:43:52 +02:00
CocoTheOwner
b6032477ee bop 2021-07-19 00:33:03 +02:00
CocoTheOwner
be2432bd03 x 2021-07-19 00:08:45 +02:00
CocoTheOwner
67ae200667 Merge remote-tracking branch 'origin/EntityRework' 2021-07-18 23:42:50 +02:00
CocoTheOwner
7464cb546d jigsaw shit 2021-07-18 23:42:38 +02:00
Brian Fopiano
c7554d9a89 :) Objects(trees) 2021-07-18 14:39:18 -07:00
CocoTheOwner
ebef02eda3 pogtrees 2021-07-18 23:37:38 +02:00
CocoTheOwner
2b6d45e7d7 lol 2021-07-18 23:33:55 +02:00
CocoTheOwner
5a5300c14b frozen 2021-07-18 23:25:06 +02:00
CocoTheOwner
fb03f369e2 smoak 2021-07-18 23:12:20 +02:00
CocoTheOwner
83761006e4 reeee 2021-07-18 22:58:31 +02:00
CocoTheOwner
a3af81e725 palms 2021-07-18 22:46:56 +02:00
CocoTheOwner
48036db744 x6 2021-07-18 22:45:45 +02:00
CocoTheOwner
d5266ab739 x5 2021-07-18 22:44:56 +02:00
CocoTheOwner
198c50ad51 x3 2021-07-18 22:44:38 +02:00
CocoTheOwner
758c03b1d9 x2 2021-07-18 22:44:30 +02:00
CocoTheOwner
f8b91f9de3 x 2021-07-18 22:43:53 +02:00
Brian Fopiano
f0ee853c1b ddd 2021-07-17 21:01:11 -07:00
Brian Fopiano
71c21fb21b d 2021-07-17 20:43:00 -07:00
Brian Fopiano
2cfe4a8b86 Merged MEsa 2021-07-17 19:58:45 -07:00
Brian Fopiano
4359f9f590 Holy rarity works 2021-07-17 19:49:44 -07:00
Brian Fopiano
25511c5947 Entity rework 2021-07-17 19:34:59 -07:00
Brian Fopiano
1df9851e90 color error gone 2021-07-16 23:17:44 -07:00
Brian Fopiano
be32f2039d rarity final 2021-07-16 23:13:19 -07:00
Brian Fopiano
c819269d4d OW biome zoom changes 2021-07-16 15:41:21 -07:00
Brian Fopiano
594640b6b8 Make it snow 2021-07-16 05:42:46 -07:00
Brian Fopiano
96f772b2d7 no idea what the fuck i did with jigsaw 2021-07-16 05:29:51 -07:00
Brian Fopiano
56101b8f20 fixes 2021-07-16 05:06:23 -07:00
Brian Fopiano
e37243e9dd colored regions 2021-07-16 05:05:33 -07:00
Brian Fopiano
b0291b9f87 Merges 2021-07-16 04:55:38 -07:00
Brian Fopiano
df536791d5 Auto stash before checking out "origin/master" 2021-07-16 04:13:24 -07:00
Brian Fopiano
a14f1d779b japfix 2021-07-16 04:05:51 -07:00
Brian Neumann-Fopiano
245c83c932 Merge pull request #134 from IrisDimensions/Rarity
dwa
2021-07-16 03:57:09 -07:00
Brian Fopiano
35e2d84d36 Made changes 2021-07-16 03:56:37 -07:00
Brian Fopiano
3196c79906 Added jap objects, and jig prereqs, will make jug later 2021-07-16 02:50:10 -07:00
Brian Fopiano
7b391f23d1 Changing the distros 2021-07-16 02:08:32 -07:00
Brian Fopiano
3d92e9948f Color me ready to die 2021-07-16 01:22:31 -07:00
Brian Fopiano
f20feba78a dont care to annotate this 2021-07-16 00:55:38 -07:00
Brian Fopiano
cdafce53e6 :) Rarity defaults 2021-07-16 00:23:28 -07:00
Brian Fopiano
027ab7c9a1 Added objects, biomes, and color 2021-07-15 23:38:08 -07:00
Brian Neumann-Fopiano
42fc72481d Merge pull request #133 from IrisDimensions/Loadsofchanges
dddd
2021-07-15 22:15:53 -07:00
Brian Fopiano
58f244a20f d 2021-07-15 22:15:33 -07:00
Brian Fopiano
0befda2b3c Adding color, refactoring the savsasasannnah 2021-07-15 22:03:34 -07:00
Brian Fopiano
ae93d9a1a7 fes 2021-07-15 14:02:40 -07:00