AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-23 12:30:56 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,044 Commits 29 Branches 143 Tags
Commit Graph

2044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
dc2784770a Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 
Conflicts:
	src/main/scala/li/cil/oc/common/block/Keyboard.scala
	src/main/scala/li/cil/oc/common/tileentity/Router.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
 2014-07-19 13:40:34 +02:00
Florian Nücke
9d49a98db7 Some cleanup. 2014-07-19 13:37:02 +02:00
Florian Nücke
5f19433ba8 Centralizing use of sided checks to make it easier to swap out for testing in the future, and added some hackiness to maybe make it more stable. 2014-07-19 13:29:45 +02:00
Florian Nücke
fe4444dacc Revert "Trying to get rid of FMLCommonHandler.instance.getEffectiveSide where possible, since it can apparently fail in some scenarios." 
This reverts commit b3813bc4f563a4066fd79db1dad16db3673bb324.

And a few more related commits. Turns out this was caused by some Bukkit plugin, tho it is still unknown which one exactly.

Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/component/TextBuffer.scala
 2014-07-19 13:17:33 +02:00
Florian Nücke
db2b443f51 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 2014-07-17 17:51:56 +02:00
Florian Nücke
15125cc4b6 More mysterious NPEs! 2014-07-17 17:51:34 +02:00
Florian Nücke
31614223ce Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 2014-07-17 17:08:37 +02:00
Florian Nücke
81bdce12be Fix potential NPE. 2014-07-17 17:07:53 +02:00
Florian Nücke
02f8acc82a Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 2014-07-17 17:02:19 +02:00
Florian Nücke
78c6d01051 Fix for version injection into config after file name change. 2014-07-17 17:01:27 +02:00
Florian Nücke
09332db963 Merge branch 'OC1.3-MC1.6.4' of C:\Users\fnuecke\Workspace\OpenComputers-1.3-MC1.6.4 into OC1.3-MC1.7.2 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/multipart/CablePart.scala
 2014-07-17 16:23:23 +02:00
Florian Nücke
738bcb5954 Merge branch 'OC1.3-MC1.6.4' of C:\Users\fnuecke\Workspace\OpenComputers-dev-MC1.6.4 into OC1.3-MC1.6.4 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/component/TextBuffer.scala
 2014-07-17 16:22:06 +02:00
Florian Nücke
20443f54e9 Fixes for the adjusted side checks. 2014-07-17 16:16:31 +02:00
Florian Nücke
83a79ad314 Merge branch 'OC1.3-MC1.6.4' of C:\Users\fnuecke\Workspace\OpenComputers-dev-MC1.6.4 into OC1.3-MC1.7.2 
Conflicts:
	src/main/java/li/cil/oc/common/asm/SimpleComponentTickHandler.java
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
	src/main/scala/li/cil/oc/common/component/TextBuffer.scala
	src/main/scala/li/cil/oc/common/tileentity/Router.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
 2014-07-17 16:07:26 +02:00
Florian Nücke
93218f4ff7 The Optional.Method annotation seems to not work in dev-env in some cases... trying to work around that to fix absence of FMP and Waila related crashes in dev-env. 2014-07-17 16:02:36 +02:00
Florian Nücke
b3813bc4f5 Trying to get rid of FMLCommonHandler.instance.getEffectiveSide where possible, since it can apparently fail in some scenarios. 2014-07-17 15:15:26 +02:00
Florian Nücke
c1d5371738 Ugly workaround for IC2+Racks, closes #404. 2014-07-14 20:24:11 +02:00
Florian Nücke
d3028a33e9 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 2014-07-14 18:30:28 +02:00
Florian Nücke
9a3049ed84 Fixed the fix for getKeyboards(), gah. 2014-07-14 18:30:09 +02:00
Florian Nücke
fa4413fd56 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 
Conflicts:
	build.properties
 2014-07-14 14:09:07 +02:00
Florian Nücke
e7d64fa6d0 Version bump. v1.3.1 2014-07-14 14:08:12 +02:00
Florian Nücke
9ebc60d9f4 Made fake player profile "complete" to avoid it not working on dedicated servers (even though partial profiles seem to be something that should be used for this, but hey...) 2014-07-14 00:13:27 +02:00
Florian Nücke
586aef4538 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 2014-07-13 23:52:22 +02:00
Florian Nücke
0321a7816c Fixed math.random, closes #400. 2014-07-13 23:19:15 +02:00
Florian Nücke
289ee04c13 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 2014-07-12 23:04:50 +02:00
Florian Nücke
da5f2590aa Shuffling lib load order a bit to see if it avoids the arm lib being sorta-kinda loaded on non-arm Linux. 2014-07-12 23:04:15 +02:00
Florian Nücke
f40ab563f7 Backported robot fake player name fix from 1.7.10... totally forgot about that one... *sigh* 2014-07-11 20:18:16 +02:00
Florian Nücke
f9f47539bc Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 2014-07-11 17:05:43 +02:00
Florian Nücke
739d0ab892 Fixed recursive recipe includes. Closes #387. 2014-07-11 17:05:22 +02:00
Florian Nücke
b00a6fed0f Adjustments for 1.7. 2014-07-11 14:12:26 +02:00
Florian Nücke
4a2629a4d3 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 2014-07-11 14:11:19 +02:00
Florian Nücke
5e268af84b Added safety try-catch to machine loading code, to avoid crashes for unexpected states. 
Added callback doc for experience upgrade and chunkloader upgrades.
 2014-07-11 14:10:54 +02:00
Florian Nücke
02e72723ef Fixed side for Keyboard's canPlaceBlockOnSide check. 2014-07-11 01:15:33 +02:00
Florian Nücke
41c9d5e70f Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 2014-07-10 11:25:54 +02:00
Florian Nücke
d24907b7ab Fixed keyboard behavior some. 
I'm not really happy with this fix, because it adds special behavior for multiblock screens where it shouldn't be, but meh.
 2014-07-10 11:25:11 +02:00
Florian Nücke
139ffc9f4a Making sure paths used for file system data storage (hdds, floppies) are directories or don't exist by trying to delete them if they're files, instead of just giving up - since apparently these can appear in some obscure scenario that can't be reproduced anymore. 2014-07-09 23:05:50 +02:00
Florian Nücke
b87e5b4346 Adjusted for 1.7. 2014-07-09 18:12:17 +02:00
Florian Nücke
4c70bb79c5 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-07-09 17:42:40 +02:00
Florian Nücke
4e8a48a56f Catching potential errors in __gc methods when persisting computers. 2014-07-09 17:37:36 +02:00
Florian Nücke
bf9de41a7b Fixed a potential (non-crashing) NPE. 2014-07-09 17:21:32 +02:00
Florian Nücke
5274cb8da0 Corrected mistake in onConnect/onDisconnect examples in JDoc of Environment interface in API. 2014-07-09 17:05:04 +02:00
Florian Nücke
c124a650df Improved performance of component callbacks. 
Enforcing tighter time limit on user __gc methods.
 2014-07-09 17:00:06 +02:00
Florian Nücke
24fccd0dfe Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	build.properties
 2014-07-08 20:42:42 +02:00
Florian Nücke
908800df54 Removed lies. 2014-07-08 20:42:11 +02:00
Florian Nücke
e03e63323c Bumpitybump. v1.3.0 2014-07-08 20:40:19 +02:00
Florian Nücke
8363c43d03 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-07-08 18:41:10 +02:00
Florian Nücke
b9d1a37b28 Merge pull request #383 from gamax92/LuaJSucks 
Fix More LuaJ things.
 2014-07-08 18:40:27 +02:00
Florian Nücke
b1a1e4a64e Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/util/LuaStateFactory.scala
 2014-07-08 16:52:57 +02:00
Florian Nücke
972b12500a Fixed 'screen.getAspectRatio' value being recomputed incorrectly. 2014-07-08 16:37:45 +02:00
Florian Nücke
4095c0eda8 Made native library loading less... special-case-laden. Just try each and every shipped library until one works. 2014-07-08 15:10:58 +02:00