Commit Graph
35 Commits
Author SHA1 Message Date
RCXcrafter a72d2f683e Every compound singularity now looks unique
Spaghetti
2016-11-17 20:52:13 +01:00
RCXcrafter ccba22ec61 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java
2016-11-09 18:43:28 +01:00
RCXcrafter 1cc7e9a649 Wip combined singularity things 2016-11-09 18:07:09 +01:00
WanionCane c60de7b2e7 Fixed MineTweaker Support (again) 2016-11-04 14:38:50 -02:00
WanionCane 7275346bc4 update the version, and removed some unused lines. 2016-11-03 19:23:00 -02:00
RCXcrafter 7f7517e24e Fixed stuff 2016-11-03 19:05:57 +01:00
RCXcrafter 7ec5a34f5f change some pngs and remove unused shaders 2016-11-03 15:14:47 +01:00
WanionCane 599d2e47c8 small fix 2 2016-11-02 22:32:41 -02:00
WanionCane d3c41db673 small fix 2016-11-02 22:28:09 -02:00
WanionCane 1cb4738830 Merge remote-tracking branch 'origin/master' 2016-11-02 22:26:15 -02:00
WanionCane f1f2c17427 new: minetweaker support 2016-11-02 22:25:59 -02:00
RCXcrafter 70c5fe8368 remove unused assets 2016-11-02 16:11:23 +01:00
WanionCane c01103aecc configured gradlew to use java 8. 2016-11-01 15:13:44 -02:00
RCXcrafter 3491385a62 added screenshots 2016-11-01 17:56:42 +01:00
WanionCane 61fee8a457 un-blacklisted the gradlew folder =p 2016-11-01 14:50:09 -02:00
RCXcrafter e4cc12b299 re-fix gitignore :P & fix unloc name 2016-11-01 17:48:00 +01:00
WanionCane 203cf18d8a more fixes. 2016-11-01 14:37:52 -02:00
WanionCane 8b80c6f844 fixed the .gitignore. 2016-11-01 14:20:12 -02:00
WanionCane 8a61943037 updated version 2016-11-01 13:56:26 -02:00
WanionCane 18cff958cb more progress 2 =p 2016-11-01 13:47:59 -02:00
WanionCane 3db3b8204f Merge remote-tracking branch 'origin/master' 2016-11-01 13:40:44 -02:00
WanionCane effbd84918 more progress =p 2016-11-01 13:40:17 -02:00
Wealthyturtle 60b756130d Fixed Link 2016-11-01 23:13:44 +08:00
WanionCane 9e6737d2cc Updated forge to 1614. 2016-11-01 12:54:42 -02:00
RCXcrafter beeda34c64 mlg rendering 2016-11-01 15:23:53 +01:00
Wealthyturtle fd5e88b3b9 Cleared Up and Fixed en_US Lang File 2016-11-01 09:19:25 +08:00
Wealthyturtle 9226f008c8 Mo 2016-11-01 09:16:16 +08:00
RCXcrafter 1726d33cce I think this is good?
What am I doing?
2016-10-31 20:56:26 +01:00
RCXcrafter 2a20460d3e Remove some files
Also more or less added the eternal singularity.
2016-10-31 19:33:05 +01:00
RCXcrafter 5a7ab357b5 Added stuff
I didn't remove stuff yet.
2016-10-31 17:16:24 +01:00
Wealthyturtle 90f6c1cc9d Update README.md 2016-10-31 21:17:18 +08:00
Wealthyturtle 57ef2f5647 Update README.md 2016-10-31 21:16:12 +08:00
Wealthyturtle 3009f626ea Update README.md 2016-10-31 21:15:52 +08:00
Wealthyturtle 98f86efe9b Add files via upload 2016-10-31 21:13:45 +08:00
Wealthyturtle d3401a17e8 Initial commit 2016-10-31 21:12:58 +08:00