607 Commits

Author SHA1 Message Date
Toby plowy
c75352bfa0
Merge pull request #179 from NewbProgrammer101/patch-2
Typo
2018-01-19 09:28:24 +01:00
Toby plowy
4f058713b5
Merge pull request #181 from farooqkz/patch-1
'of' -> 'on'
2018-01-19 09:26:51 +01:00
Farooq Karimi Zadeh
75f629087f
'of' -> 'on' 2018-01-19 11:47:02 +03:30
NewbProgrammer101
16ac8f40e3
Merge branch 'master' into patch-2 2017-12-16 13:42:04 -06:00
NewbProgrammer101
6a4bbb2209
Merge branch 'master' into patch-2 2017-12-16 13:41:37 -06:00
D00Med
27e2e62c71 Paintings update
>removed hummingbird
>added easel
2017-12-16 09:34:23 +10:00
NewbProgrammer101
2657ddbfcb
Update init.lua 2017-12-12 17:15:29 -06:00
NewbProgrammer101
9d5d29155c
Update nodes.lua 2017-12-12 17:12:18 -06:00
NewbProgrammer101
a64a06e024
Merge branch 'master' into patch-2 2017-12-12 16:20:24 -06:00
NewbProgrammer101
9fa499a871
Merge branch 'master' into patch-2 2017-12-12 16:19:40 -06:00
D00Med
0bd60ccba0 Paintings update
>Added artist infotext.
>Removed collision box
>Started work on the easel
2017-12-13 07:24:56 +10:00
NewbProgrammer101
7acc00e7a0
Merge branch 'master' into patch-2 2017-12-11 16:59:54 -06:00
NewbProgrammer101
404233db16
Merge branch 'master' into patch-2 2017-12-11 16:56:51 -06:00
Toby plowy
264d1e0237 painting 2017-12-11 21:57:32 +01:00
D00Med
311b489535 New painting 2017-12-11 07:05:14 +10:00
NewbProgrammer101
fce300809b
Typo 2017-12-08 16:46:08 -06:00
Toby plowy
4d092e3a75 painting canges 2017-12-08 21:02:31 +01:00
Toby plowy
145fa4126d
Merge pull request #172 from D00Med/snow_sounds
snow mono
2017-11-26 13:52:18 +01:00
Toby plowy
9d5c5e0b58
Merge pull request #171 from NewbProgrammer101/patch-1
Typo
2017-11-26 13:51:27 +01:00
Toby plowy
5a29eb837f snow mono 2017-11-26 12:49:12 +01:00
NewbProgrammer101
da2840c2ca
Typo 2017-11-25 16:13:03 -06:00
Toby plowy
e4433ae52d paintings 2017-11-25 21:52:11 +01:00
D00Med
8b871fd05e paintings 2017-11-25 11:43:05 +10:00
D00Med
c7bec8bf9b fix for paintings 2017-11-25 11:21:20 +10:00
Toby plowy
9e8dd72802 monalisa 2017-11-25 02:17:24 +01:00
D00Med
cc5a5816ad paintings 2017-11-24 11:23:27 +10:00
Toby plowy
57be2da0b0 rusty plating 2017-11-23 14:02:33 +01:00
Toby plowy
130de5f06b ok now its fixed 2017-11-23 12:41:12 +01:00
Toby plowy
b52907d17c eeeeeehhhhhhhhhh fix i hope 2017-11-23 02:13:46 +01:00
Toby plowy
941ca71f4c i think i mesed it up :/ 2017-11-23 02:11:31 +01:00
Toby plowy
00367e0584 some stuff 2017-11-23 02:08:55 +01:00
D00Med
95400788ba move flowers from mapgen to flowers_plus 2017-11-23 06:27:22 +10:00
D00Med
9867365568 corrugated iron 2017-11-20 14:48:47 +10:00
D00Med
2755801a14 D00Med update 20/11/17
>added coloured glass blocks
>fixed coloured glass panes
>added decorative nodes for towers
2017-11-20 09:27:23 +10:00
Toby plowy
8e61299fd5 normal grass recolor 2017-11-19 20:40:04 +01:00
Toby plowy
5471428a0a red coral 2017-11-19 15:54:12 +01:00
D00Med
ed588b13e9 cavecrab 2017-11-18 08:25:12 +10:00
D00Med
f5ab34fc2b crabspider
>added crabspider (hostile mob)
2017-11-16 07:17:14 +10:00
D00Med
6164a5ab81 Merge remote-tracking branch 'refs/remotes/origin/master' into 1.1 2017-11-12 12:51:11 +10:00
D00Med
72884bf11f Stained glass 2017-11-12 12:50:37 +10:00
D00Med
b24734e90e
Merge pull request #161 from NewbProgrammer101/master
Fix licensing errors
2017-11-12 07:15:15 +10:00
NewbProgrammer101
456e717676
Update LICENSE 2017-11-11 11:48:11 -06:00
NewbProgrammer101
288e661d18
Update license.txt 2017-11-11 11:47:23 -06:00
NewbProgrammer101
5bc5bfc092
Update license.txt 2017-11-11 11:46:57 -06:00
NewbProgrammer101
4d3e8db648
Update license.txt 2017-11-11 11:46:24 -06:00
NewbProgrammer101
851409ee5a
Update license.txt 2017-11-11 11:45:54 -06:00
NewbProgrammer101
74597ece9a
Update license.txt 2017-11-11 11:45:30 -06:00
NewbProgrammer101
fccf534576
Update license.txt 2017-11-11 11:45:05 -06:00
NewbProgrammer101
f4376f47ca
Update license.txt 2017-11-11 11:44:46 -06:00
NewbProgrammer101
36c92f4091
Update license.txt 2017-11-11 11:44:27 -06:00