aidancbrady
|
c6a09b5658
|
<1500 errors
|
2016-05-24 21:22:39 -04:00 |
|
aidancbrady
|
3983cc858b
|
Begin the great port. 2378 errors to go!
|
2016-05-24 20:04:40 -04:00 |
|
aidancbrady
|
fa46db4ce6
|
Removed unused mtl and obj commands, got heat network (and conductors) working with capabilities
|
2016-05-24 18:47:43 -04:00 |
|
aidancbrady
|
d5656b0264
|
Merge branch 'development' into 1.8.9
* development:
Fixed Turbine Stats crash
Fixed Turbine container crash
Bumped version, fixed Steel Casing recipe, fixed erratic heat behavior, fixed Turbine render crash, added missing localization, fixed Bin crafting crash
ja_JP.lang - translate generators and ores tooltip, fix some entries
ja_JP.lang - translate general machinery and Blocks(without ores) tooltip.
ja_JP.lang - little fix/change
ja_JP.lang - fix/change some entries
ja_JP.lang - translate tooltip and gui text
ja_JP.lang - gui and tooltip translation progress
ja_JP.lang - fix/change some translation(items and blocks)
ja_JP.lang tweak some entries based on v9
Conflicts:
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/util/RecipeUtils.java
|
2016-05-21 15:31:26 -04:00 |
|
Ben Spiers
|
b8b2fd46e1
|
Get most of the transmitters rendering properly
|
2016-05-21 20:09:20 +01:00 |
|
aidancbrady
|
0e0f9584f3
|
Bumped version, fixed Steel Casing recipe, fixed erratic heat behavior, fixed Turbine render crash, added missing localization, fixed Bin crafting crash
|
2016-05-21 13:52:28 -04:00 |
|
Ben Spiers
|
30510efaaa
|
Transmitter Render Work
OBJ models are really nice to work with
|
2016-05-21 14:21:11 +01:00 |
|
aidancbrady
|
261a32ee01
|
Fixed slurry gas sprites, add chemical machine JEI handlers, start work on remaining machines
|
2016-05-20 11:13:01 -04:00 |
|
aidancbrady
|
2f61ea103f
|
Set up element bounds and hidden items in JEI, also merged in fixed GUIs
|
2016-05-19 01:31:56 -04:00 |
|
aidancbrady
|
ac7f2f9783
|
Remove unused commands in .obj and .mtl files, remove Electric Pump and Fluidic Plenisher TESRs
|
2016-05-19 00:22:20 -04:00 |
|
aidancbrady
|
2bab84e090
|
Add missing resource
|
2016-05-17 11:43:51 -04:00 |
|
aidancbrady
|
10098e300d
|
Fixed missing texture errors, fixed bounding block particles, fixed Digital Miner in-world and item render
|
2016-05-11 23:48:10 -04:00 |
|
aidancbrady
|
8493e6f4d1
|
Begin overhauling TE renders. Certain blocks are gonna need to remain TESRs
|
2016-05-11 19:09:28 -04:00 |
|
aidancbrady
|
8b1017a3a8
|
Lots and lots of fancy rendering!
|
2016-05-11 17:42:51 -04:00 |
|
aidancbrady
|
a1100dd47a
|
More render work!
- Added BuildCraft impl to render Model3D
- Got Gas and Fluid icons working properly
- Fixed CTM crash
- Fixed Flamethrower flame rotation issue
- Fluid Tank now renders inner fluid
- Fix some texture errors
|
2016-05-10 19:37:00 -04:00 |
|
aidancbrady
|
730ee4e450
|
Loads and loads of render work. I can see the light at the end of the tunnel
- Finished CTM
- BasicBlock item rendering
- Balloon item rendering
- Plastic Fence item rendering
- Started work on Portable Tank fluid item rendering
- Fixed Obsidian TNT and Bin rendering
|
2016-05-10 15:38:12 -04:00 |
|
aidancbrady
|
c29e4ab9bc
|
Work on rendering- need to figure out why flamethrower sound is getting cut off
|
2016-05-05 21:01:10 -04:00 |
|
aidancbrady
|
13893bd705
|
A good bit of work
- Fixed infuse sprites
- Fixed liquid sprites
- Fixed Plastic Fence block states
- got Plastic Fence to render in block form
|
2016-05-04 23:37:21 -04:00 |
|
aidancbrady
|
01a03ecbcf
|
Factory Installer textures, fixed Walkie Talkie and Crafting Formula textures
|
2016-05-04 19:04:39 -04:00 |
|
Ben Spiers
|
384cf174bb
|
Get capabilities off the ground
|
2016-05-04 12:45:12 +01:00 |
|
aidancbrady
|
0ddc8da53e
|
Remove Lead Dust clone
|
2016-05-02 23:00:49 -04:00 |
|
aidancbrady
|
f03acedcd9
|
Get some item resource textures working
|
2016-05-02 22:57:57 -04:00 |
|
Ben Spiers
|
185ea3c4d8
|
Experiments with Capabilities.
|
2016-05-01 23:10:47 +01:00 |
|
Ben Spiers
|
bebad0c15e
|
Experimental new MCMultipart rewrite of transmitters.
Less changed code than expected! Nothing renders or works yet though.
|
2016-04-30 19:53:39 +01:00 |
|
Ben Spiers
|
55df74e240
|
Improve handling of energy cube item model
Use custom mesh definition now, it makes more sense.
|
2016-04-28 00:31:06 +01:00 |
|
Ben Spiers
|
5825c84fad
|
Merge branch 'development' into 1.8.9
|
2016-04-27 23:47:00 +01:00 |
|
aidancbrady
|
42cb905d3c
|
Tiny cleanup
|
2016-04-25 18:10:35 -04:00 |
|
Ben Spiers
|
0cb18773aa
|
Merge branch 'development' into 1.8.9
|
2016-04-25 16:08:06 +01:00 |
|
Ben Spiers
|
78c2afb5ea
|
Actually get it compiling again.
Seems to run ok, I think?
|
2016-04-25 13:11:26 +01:00 |
|
aidancbrady
|
2873c0c797
|
Added Fuelwood Heater, currently has no texture. After doing some server timing tests, the last thing we need to make efficient is the Formulaic Assemblicator
|
2016-04-23 17:09:01 -04:00 |
|
aidancbrady
|
b97c6d8f4b
|
Quantum Entangloporter model!
|
2016-04-22 23:15:18 -04:00 |
|
aidancbrady
|
982749bb47
|
Resistive Heater model, fixed Fusion Reactor
|
2016-04-14 15:54:52 -04:00 |
|
aidancbrady
|
00e7a99cf3
|
Fixed recipe
|
2016-03-21 20:34:46 -04:00 |
|
aidancbrady
|
c481180088
|
A few bug fixes, added recipes for Security Desk
|
2016-03-21 19:43:03 -04:00 |
|
aidancbrady
|
a18da2ad27
|
Integrate security into more machines
|
2016-03-21 18:25:27 -04:00 |
|
aidancbrady
|
f904c8b80c
|
Start integrating security into all machinery. This is a very rough implementation, there's gonna be a lot of balance and corrections to make before release
|
2016-03-21 16:53:29 -04:00 |
|
aidancbrady
|
1b2aee283e
|
Work on security framework
|
2016-03-19 22:03:17 -04:00 |
|
Ben Spiers
|
84336ec4d1
|
Merge branch 'development' into 1.8.9
Huge merge with 202 conflicts, hopefully not *too* broken.
|
2016-03-18 04:24:19 +00:00 |
|
aidancbrady
|
38a68541c4
|
Tiered Bins, better tier management!
|
2016-03-16 21:41:55 -04:00 |
|
aidancbrady
|
ca7fc4aaf4
|
Formulaic Assemblicators are cool!
|
2016-03-15 19:30:16 -04:00 |
|
aidancbrady
|
9c8e392638
|
Loads more work on Formulaic Assemblicators. Seem to be about polished!
|
2016-03-15 19:07:22 -04:00 |
|
aidancbrady
|
779c2c49e7
|
Lots of work on Formulaic Assemblicators, still need to do a good bit of polishing
|
2016-03-15 17:34:17 -04:00 |
|
aidancbrady
|
866c76bafe
|
Redesigned Filter Cards to serve as Configuration Cards, fixed inventory interaction bug, fixed Creative Energy Cube bug, added new recipes
|
2016-03-05 13:17:58 -05:00 |
|
aidancbrady
|
f8f8dfa737
|
More work on entangloporters
|
2016-03-04 13:14:48 -05:00 |
|
aidancbrady
|
ad15e359ac
|
Work on Quantum Entangloporters. I get the feeling this is gonna be a big project
|
2016-03-04 11:06:05 -05:00 |
|
aidancbrady
|
f09010a927
|
Many more fixes
|
2016-02-28 19:11:43 -05:00 |
|
aidancbrady
|
7c160cc264
|
Interface and rendering fixes
|
2016-02-28 18:11:50 -05:00 |
|
aidancbrady
|
c0f465d0cb
|
Boiler rendering and interface, still yet to do statistics
|
2016-02-28 16:44:05 -05:00 |
|
aidancbrady
|
155758398c
|
Continued boiler work
|
2016-02-28 11:52:52 -05:00 |
|
aidancbrady
|
9d55f6cc8a
|
Lots of work on resistive heaters, still mostly unfinished
|
2016-02-26 19:51:37 -05:00 |
|