a30e6dcb9b
Added an "error" model for Matter decomposer, it's basically a copy of idle model because decomposer's blockstate keeps resetting after every build and changing both idle and error to idle model won't work.
2021-08-30 15:26:31 +06:00
2573a82559
Brain fart
2021-08-30 13:50:20 +06:00
03afe7baad
Move render helpers to render package
2021-08-30 11:50:14 +07:00
af828c1296
Move screen package to client package
2021-08-30 10:50:09 +07:00
b304a5f12a
Some tweaks to black hole
2021-08-30 10:42:41 +07:00
fde2ab46ee
Remove auto generated files
2021-08-30 10:26:24 +07:00
7af10649ef
Merge remote-tracking branch 'remotes/origin/master' into master
2021-08-30 10:25:05 +07:00
8fe2d8daa8
Black holes
2021-08-30 10:22:58 +07:00
bf49fc030d
Added a model for matter bottler.
...
Added models for condensation drives.
Added a model for drive viewer.
Added container block textures.
Added Tritanium block textures.
Added item names to container blocks.
Changed Creative matter capacitor to look more like creative battery.
2021-08-30 04:41:19 +06:00
ac7bcc0f75
Add gitkeeps
2021-08-29 20:02:01 +07:00
a7ed5d8dae
Also generate models
2021-08-29 19:56:28 +07:00
1a9c86a1f0
Auto generate blockstates for basic blocks
2021-08-29 19:53:09 +07:00
9ecbad9f48
Make crates mineable
2021-08-29 19:35:36 +07:00
c614509ad6
Ignore generated files
2021-08-29 19:23:24 +07:00
baa789b77a
More building blocks
2021-08-29 19:22:59 +07:00
a246cf5e25
Add crates?
2021-08-29 18:54:41 +07:00
300c27d366
Split worker class
2021-08-29 18:27:20 +07:00
651ba41da7
Add matter bottler blockstate
2021-08-29 18:17:37 +07:00
26a1388c3d
Add working state to bottler
2021-08-29 18:14:08 +07:00
a85ee9fb98
Ignore generated assets
2021-08-29 18:13:59 +07:00
a5fe020564
Merge remote-tracking branch 'origin/master' into master
2021-08-29 17:02:34 +07:00
a02c7360fa
Add drops for matter bottler and drive viewer
2021-08-29 17:02:10 +07:00
3506e661b1
Add second variant of condensation drive
2021-08-29 16:49:02 +07:00
1a4c1b468a
Fix quick move duping everything
2021-08-29 16:38:07 +07:00
b3b1a03136
Filter of autopickup for condensation drive
2021-08-29 16:30:34 +07:00
f1f1ce897c
Implement clone in drive menu
2021-08-28 15:23:44 +07:00
b0e9a96e50
Reasonable interaction with drive viewer
2021-08-28 14:47:01 +07:00
fa72e6ec03
Working interaction with drives
2021-08-28 10:12:13 +07:00
de22ab54c0
More test code regarding drives
2021-08-27 18:53:25 +07:00
998ce95f1c
Change back id to being UUIDs
2021-08-27 14:33:36 +07:00
05bed3a737
Drive viewer test code
2021-08-27 13:16:54 +07:00
2166119a75
Improve drive testcode
2021-08-26 10:41:48 +07:00
e7e12bed8c
Condensation drive test
2021-08-25 22:53:17 +07:00
76de8549aa
fixed an error in matter decomposer's model, again.
2021-08-25 02:42:23 +06:00
1650e63e20
Merge branch 'master' of https://gitlab.com/DBotThePony/overdrive-that-matters
2021-08-24 21:42:25 +06:00
4613b5549e
fixed an error in matter decomposer's model
2021-08-24 21:41:59 +06:00
d7a62f6d3c
Merge remote-tracking branch 'origin/master' into master
2021-08-24 22:41:06 +07:00
495af87688
Fix polluting global item renderer Z offset
2021-08-24 22:40:43 +07:00
e5f81569f9
Better research screen
2021-08-24 22:28:44 +07:00
f388639fc6
Primitive research "tree"
2021-08-24 22:09:38 +07:00
a5af0a4a00
Black background for android research "tree"
2021-08-24 21:25:06 +07:00
27945b62dc
Don't offset inner render
2021-08-24 21:24:47 +07:00
e79bdb4326
Scissor and draggable canvas panel for android research window
2021-08-24 21:08:26 +07:00
e7b810f1a8
Fix MtE burn not awarded for outer battery
2021-08-24 19:16:44 +07:00
dc76513dc8
Proper stat casing
2021-08-24 19:02:44 +07:00
9f7cc25ef5
Stats!
2021-08-24 19:01:34 +07:00
7c5bfb1b36
Nanobots, Regeneration and Armor features and research
2021-08-24 18:14:53 +07:00
39795e2659
Added Nutrient paste in language file, because it was not here for some reason
2021-08-24 14:15:53 +06:00
c45c7045d9
Disallow quick regeneration
2021-08-24 14:50:48 +07:00
64d41e450a
Make builder also build research entry, add blocking research
2021-08-24 14:19:18 +07:00