Commit graph

1377 commits

Author SHA1 Message Date
Ellpeck
a5c97e09bd Merge pull request #44 from canitzp/1.8
More JSONs
2016-01-10 17:34:15 +01:00
canitzp
c645a0e770 More JSONs 2016-01-10 17:00:07 +01:00
Ellpeck
3f165f897e ALL OF THE JSONS DONE.
Now I just need to wait for canitzp to finish the special models~
2016-01-10 15:29:45 +01:00
Ellpeck
390c1289f8 Merge pull request #43 from canitzp/1.8
More JSONs
2016-01-10 15:18:56 +01:00
canitzp
0cb9d6f8c9 More JSONs 2016-01-10 15:12:48 +01:00
canitzp
0b68b7e296 More JSONs 2016-01-10 15:12:20 +01:00
Ellpeck
860ef3d0ef Moooooar texture work ~ 2016-01-10 02:51:31 +01:00
Ellpeck
5e0e79d691 Some more texture work & fixing.
Nothing special.
Well, lots of special stuff actually.
2016-01-10 01:17:17 +01:00
canitzp
0f090df466 Merge remote-tracking branch 'origin/1.8' into 1.8 2016-01-09 18:37:52 +01:00
canitzp
15c03f2a43 FurnaceSolar/Solar Panel JSON 2016-01-09 18:37:30 +01:00
canitzp
f18dfa97c8 FurnaceSolar/Solar Panel JSON 2016-01-09 18:37:21 +01:00
canitzp
9cda52f90b Merge pull request #1 from Ellpeck/1.8
Update Repository
2016-01-09 18:10:18 +01:00
Ellpeck
bca7812097 Merge pull request #40 from canitzp/1.8
-Coffee Machine JSON \o/
2016-01-09 18:08:42 +01:00
canitzp
8efe5482f8 -Coffee Machine JSON \o/ 2016-01-09 18:07:18 +01:00
Ellpeck
4ed17950b9 Removed TESRs for the most part and added a "not complete"-disclaimer for the upcoming 1.8.9 beta releases ~ 2016-01-09 17:53:06 +01:00
Ellpeck
0d00143298 Maybe fixed a bug caused by desync that would cause blocks to have ridiculous amounts of energy/luqiuid 2016-01-09 17:30:24 +01:00
Ellpeck
61b921b2dd Some more texture work.
Done for now.
Hahah.
Good joke.
2016-01-09 14:35:04 +01:00
Ellpeck
fec10edbc2 Loooots more texture work.
Okay, I'm done for today.
2016-01-09 02:36:43 +01:00
Ellpeck
2babb6cf0b Some more texture work, fixed Special Render for items 2016-01-09 00:04:30 +01:00
Ellpeck
6db479f94e More stuff & special render fix testing 2016-01-08 23:36:35 +01:00
Ellpeck
8f959c92aa More Fixes °~°
Continuing some other time.
2016-01-08 21:55:39 +01:00
Ellpeck
51872bbc23 Dis game is ass - More textures 2016-01-08 20:51:03 +01:00
Ellpeck
98efec99d0 Fixed knife crafting being broken 2016-01-08 18:09:11 +01:00
Ellpeck
77860267da ITEMS AND BLOCKS RENDER
Well.
Not all of them.
2016-01-08 17:25:31 +01:00
Ellpeck
c08d2221fa This doesn't work. 2016-01-08 16:52:53 +01:00
Ellpeck
020384f5ff Put Version and API Name in main class 2016-01-08 15:33:19 +01:00
Ellpeck
6693636247 Bump API version.
If I don't do it now, I'll forget.
2016-01-08 15:26:52 +01:00
Ellpeck
92b9b7a844 Some more "minor fixes", if you want to call it that.
(I declare you completely nuts if you do, though.)
2016-01-08 15:21:05 +01:00
Ellpeck
f602eccca0 Remove Position.
Don't need it.
2016-01-08 13:31:58 +01:00
Ellpeck
6ee039fcc2 Fix some other minor bugs that I found quickly.
I really need to start working on actually repairing the textures.
2016-01-08 08:18:27 +01:00
Ellpeck
5a1b6f9d78 Fixed a bug with the crafting page.
//Like that would matter..
2016-01-08 08:13:42 +01:00
Ellpeck
0ca8fc90c1 IT RUNS!
No textures though.
And lots of bugs.
2016-01-08 08:10:55 +01:00
Ellpeck
b2a00d2c8d Sooo.. yea, I'm still at it.
And still not compilable.
Oh god.
2016-01-07 23:42:43 +01:00
Ellpeck
020745a813 Remember how I said "I'm nearing the end of bugfixing"?
Well that was a lie apparently.
2016-01-07 21:41:28 +01:00
Ellpeck
db1e183e45 Another status update.
Getting to the finish line when it comes to removing compile-breaking bugs!
2016-01-07 19:47:53 +01:00
Ellpeck
02e66e23df PROGRESS!!
Yes, this will be progress updates.
A lot.
2016-01-07 19:04:29 +01:00
Ellpeck
d39fb82992 EVERYTHING IS BROKEN 2016-01-07 18:21:00 +01:00
Ellpeck
1b176008a5 Made the solar thingy cheaper. 2016-01-07 16:07:23 +01:00
Ellpeck
dae0a9a0b4 Balanced the magnet ring a bit °~° 2016-01-07 16:04:25 +01:00
Ellpeck
57e77e8453 Made the growth ring a little more expensive. 2016-01-07 16:03:07 +01:00
Ellpeck
fbba25d5ad The growth ring now only uses RF when growing stuff 2016-01-07 15:56:57 +01:00
Ellpeck
493be37ede The magnet ring now only uses RF when actually sucking items.
Makes more sense, does it not?
2016-01-07 15:54:41 +01:00
Ellpeck
fa79e57cb6 Made looking up the double furnace in the booklet possible 2016-01-06 19:58:59 +01:00
Ellpeck
227bfeadec r20.
I'm sorry.
2016-01-06 18:12:16 +01:00
Ellpeck
5ef8626a40 Fix another stupid obfuscation bug :x 2016-01-06 18:10:01 +01:00
Ellpeck
a135ecf32c r19! Sorry for this update >_> 2016-01-06 05:28:31 +01:00
Ellpeck
f16f1e0496 Fixed a nasty bug with obfuscation causing some booklet pages to break horribly 2016-01-06 05:17:54 +01:00
Ellpeck
18bb252dcf do all the things 2016-01-06 05:10:34 +01:00
Ellpeck
fecc2e3d3a Merge pull request #37 from XDjackieXD/master
fixed that the deobf & api jar had everything duplicated...
2016-01-06 05:08:46 +01:00
XDjackieXD
8ec46efe28 fixed that the deobf & api jar had everything duplicated... 2016-01-06 05:07:32 +01:00